ubuntu-openstack-ci

Merge lp:~thedac/ubuntu-openstack-ci/cidr-net-dns into lp:ubuntu-openstack-ci

  1. cidr-net-dns
  2. Merge into trunk
Proposed by David Ames
Status: Merged
Approved by: Ryan Beisner
Approved revision: 422
Merged at revision: 422
Proposed branch: lp:~thedac/ubuntu-openstack-ci/cidr-net-dns
Merge into: lp:ubuntu-openstack-ci
Diff against target: 16 lines (+1/-1)
1 file modified
run/job-parts/osci_openstack_common.sh (+1/-1)
To merge this branch: bzr merge lp:~thedac/ubuntu-openstack-ci/cidr-net-dns
Reviewer Review Type Date Requested Status
Ubuntu OpenStack CI Team Pending
Review via email: mp+374571@code.launchpad.net

Commit message

Use DNS from the TEST_CIDR_EXT

Description of the change

Use DNS from the TEST_CIDR_EXT

Use the CIDR under test's .2 address for setting the overcloud subnet DNS. It
seems there are security group rule in the way of using the _admin_net's .2.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run/job-parts/osci_openstack_common.sh'
2--- run/job-parts/osci_openstack_common.sh 2019-10-18 20:11:35 +0000
3+++ run/job-parts/osci_openstack_common.sh 2019-10-22 23:16:45 +0000
4@@ -49,11 +49,11 @@
5 f_line $FUNCNAME
6 f_activate_clients
7 f_subnet_id
8- export TEST_NAME_SERVER="$(awk '/^nameserver /{ print $2 }' /etc/resolv.conf | head -n 1 | xargs)"
9 export TEST_NET_ID="$NETWORK_ID" # Comes from oscirc
10 export TEST_CIDR_EXT="$NETWORK_CIDR" # Comes from oscirc
11 export TEST_CIDR_END="$(ipcalc $TEST_CIDR_EXT | awk '/^HostMax: /{ print $2 }')"
12 export TEST_GATEWAY="$(ipcalc $TEST_CIDR_EXT | awk '/HostMin:/{ print $2 }')"
13+ export TEST_NAME_SERVER=$(echo $TEST_GATEWAY | sed "s/\.1$/.2/g")
14
15 # OSCI subnet dhcp pools end at the highest .199, so the
16 # floating IP and VIP pools are safe in the last .200-254 of the network.

Subscribers

People subscribed via source and target branches