openstack/tripleo-ci
Code Issues Proposed changes

Test hostname map

Browse Source 
Deploy with a hostname map and verify that the instance names end
up as specified.

Change-Id: I3a120e784c8862b112869288ccf87ee1634b3564
This commit is contained in:
Ben Nemec 2016-09-27 21:35:12 +00:00
parent 2cb41b9d1f
commit c36eafb900
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/deploy.sh
View File

@ -304,6 +304,11 @@ if [ "$MULTINODE" == 0 ] && [ "$OVERCLOUD" == 1 ] ; then
if [ $PREDICTABLE_PLACEMENT == 1 ]; then
# Verify our public VIP is the one we specified
grep -q 10.0.0.9 ~/overcloudrc || (echo "Wrong public vip deployed " && exit 1)
# Verify our specified hostnames were used
nova list | grep -q controller-0-tripleo-ci-a-foo
nova list | grep -q controller-1-tripleo-ci-b-bar
nova list | grep -q controller-2-tripleo-ci-c-baz
nova list | grep -q compute-0-tripleo-ci-a-test
fi
if [ $PACEMAKER == 1 ] ; then

6
test-environments/hostname-map.yaml Normal file
View File

@ -0,0 +1,6 @@
parameter_defaults:
HostnameMap:
overcloud-controller-0: controller-0-tripleo-ci-a-foo
overcloud-controller-1: controller-1-tripleo-ci-b-bar
overcloud-controller-2: controller-2-tripleo-ci-c-baz
overcloud-novacompute-0: compute-0-tripleo-ci-a-test

2
toci_gate_test.sh
View File

@ -187,7 +187,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
# In ci our overcloud nodes don't have access to an external netwrok
# --ntp-server is here to make the deploy command happy, the ci env
# is on virt so the clocks should be in sync without it.
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/ips-from-pool-all.yaml"
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/ips-from-pool-all.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/hostname-map.yaml"
NETISO_V4=1
PACEMAKER=1
PREDICTABLE_PLACEMENT=1