b252174956
This patch removes the INSECURE_REGISTRY options from the docker_registry manifest. These configuration options can conflict with the configuration done in the docker profile. Furthermore they are not directly related to the docker registry service itself and are better managed as part of the other profile. Depends-On: I9e9c495b9095590dcee14e0705728c68c058d2b5 Change-Id: I6d0cfc9aafd2184161666bb9edcce16a0ec5a06f Closes-bug: #1736587
75 lines
2.3 KiB
Puppet
75 lines
2.3 KiB
Puppet
# Copyright 2017 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
# == Class: tripleo::profile::base::docker_registry
|
|
#
|
|
# Docker Registry profile for tripleo
|
|
#
|
|
# === Parameters:
|
|
# [*enable_container_images_build*]
|
|
# (Optional) Whether to install tools to build docker container images
|
|
# Defaults to hiera('enable_container_images_build', true)
|
|
#
|
|
# [*registry_host*]
|
|
# (String) IP address or hostname the Docker registry binds to
|
|
# Defaults to hiera('controller_host')
|
|
#
|
|
# [*registry_port*]
|
|
# (Integer) The port on which the Docker registry is listening on
|
|
# Defaults to 8787
|
|
#
|
|
# [*registry_admin_host*]
|
|
# DEPRECATED: (String) IP address or hostname the Docker registry binds to in the admin
|
|
# network
|
|
# Defaults to hiera('controller_admin_host')
|
|
#
|
|
#
|
|
class tripleo::profile::base::docker_registry (
|
|
$enable_container_images_build = hiera('enable_container_images_build', true),
|
|
# these are used within the config.yaml below
|
|
$registry_host = hiera('controller_host'),
|
|
$registry_port = 8787,
|
|
# DEPRECATED PARAMETERS
|
|
$registry_admin_host = false,
|
|
) {
|
|
|
|
include ::tripleo::profile::base::docker
|
|
|
|
# We want a v2 registry
|
|
package{'docker-registry':
|
|
ensure => absent,
|
|
allow_virtual => false,
|
|
}
|
|
package{'docker-distribution': }
|
|
if str2bool($enable_container_images_build) {
|
|
package{'openstack-kolla': }
|
|
}
|
|
file { '/etc/docker-distribution/registry/config.yml' :
|
|
ensure => file,
|
|
content => template('tripleo/docker_distribution/registry_config.yml.erb'),
|
|
owner => 'root',
|
|
group => 'root',
|
|
mode => '0644',
|
|
require => Package['docker-distribution'],
|
|
notify => Service['docker-distribution'],
|
|
}
|
|
|
|
service { 'docker-distribution':
|
|
ensure => running,
|
|
enable => true,
|
|
require => Package['docker-distribution'],
|
|
}
|
|
|
|
}
|