openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Parametrize containers compute DNS

Browse Source 
Make containers compute DNS a parameter

Change-Id: I16b6a19fb8f2ec8edd3aaad968090baad93bee81
This commit is contained in:
Sagi Shnaidman 2017-01-05 15:46:31 +02:00 committed by Wes Hayutin
parent d7503d1b53
commit cca3844464
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/general_config/containers_minimal.yml
View File

@ -20,7 +20,11 @@ extra_args: >-
network_isolation: true network_isolation: true
enable_pacemaker: false enable_pacemaker: false
overcloud_ipv6: false overcloud_ipv6: false
containerized_overcloud: true containerized_overcloud: 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
# This enables TLS for the undercloud which will also make haproxy bind to the # This enables TLS for the undercloud which will also make haproxy bind to the
# configured public-vip and admin-vip. # configured public-vip and admin-vip.

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

@ -10,3 +10,4 @@ container_image: CentOS-Atomic-Host-7-GenericCloud.qcow2
container_url: "http://cloud.centos.org/centos/7/atomic/images/{{ container_image }}.gz" container_url: "http://cloud.centos.org/centos/7/atomic/images/{{ container_image }}.gz"
undercloud_network_cidr: 192.168.24.0/24 undercloud_network_cidr: 192.168.24.0/24
ctl_plane_ip: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}" ctl_plane_ip: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"
containers_compute_dns_server: 8.8.8.8

2
roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
View File

@ -23,7 +23,7 @@ cd {{ working_dir }}
subnet_uuid=`neutron subnet-list | grep 192.168.24 | awk '{ print $2 }'` subnet_uuid=`neutron subnet-list | grep 192.168.24 | awk '{ print $2 }'`
echo $subnet_uuid echo $subnet_uuid
neutron subnet-update $subnet_uuid --dns-nameserver 192.168.23.1 neutron subnet-update $subnet_uuid --dns-nameserver {{ containers_compute_dns_server }}
neutron subnet-show $subnet_uuid neutron subnet-show $subnet_uuid
## * Download the Cloud Atomic Image and upload to glance ## * Download the Cloud Atomic Image and upload to glance