openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Make docker_registry_namespace a variable 

Also remove containers_compute_dns_server variable that is not used
anymore.

Change-Id: Ic0cd05701fd558b1df0658b59efadd17ed620102
This commit is contained in:
Martin André 2017-04-20 15:52:14 +02:00
parent 2827ac8462
commit d540d4f763
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/general_config/containers_undercloud_minimal.yml
View File

@ -25,9 +25,6 @@ overcloud_ipv6: false
# containers config
containerized_overcloud: false
containerized_undercloud: true
# 192.168.23.1 is the dns server on the virthost
# 8.8.8.8 also works across virthost and ovb env
containers_compute_dns_server: 8.8.8.8
# deploy the undercloud with containers
undercloud_install_script: undercloud-deploy.sh.j2

2
roles/overcloud-prep-containers/defaults/main.yml
View File

@ -6,4 +6,4 @@ overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
containers_default_parameters: container-default-parameters.yaml.j2
overcloud_prep_containers_log: overcloud_prep_containers.log
ctl_plane_ip: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"
containers_compute_dns_server: 8.8.8.8
docker_registry_namespace: tripleoupstream

5
roles/overcloud-prep-containers/templates/container-default-parameters.yaml.j2
View File

@ -1,8 +1,5 @@
parameter_defaults:
# NovaImage: atomic-image # FYI the team is using overcloud-full currently https://review.openstack.org/#/c/395880/
# Defaults to 'tripleoupstream'. Specify a local docker registry
# Example: 192.0.2.1:8787/tripleoupstream
DockerNamespace: {{ ctl_plane_ip }}:8787/tripleoupstream
# Enable local Docker registry
DockerNamespace: {{ ctl_plane_ip }}:8787/{{ docker_registry_namespace }}
DockerNamespaceIsRegistry: true