diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-10-07 05:00:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-10-07 05:00:33 +0000 |
| commit | 36c52d62c5e27f20ffd86a9f9635bd1847f3116a (patch) | |
| tree | b1e25af40e5d07111b9fbb7cd306ef2550ef1507 | |
| parent | 7327fe00c4f7fa2aeb20dfb316a4195752baccab (diff) | |
| parent | 1b43d71a5b362fa58c6f7841017bb6b9fbe38ab3 (diff) | |
Merge "Use sub_nodes_private instead of node_private" into stable/pike
| -rw-r--r-- | ci/common/net-config-multinode-os-net-config.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/common/net-config-multinode-os-net-config.yaml b/ci/common/net-config-multinode-os-net-config.yaml index 9d45a9ff..316862ee 100644 --- a/ci/common/net-config-multinode-os-net-config.yaml +++ b/ci/common/net-config-multinode-os-net-config.yaml @@ -56,14 +56,14 @@ resources: function network_config_hook { primary_private_ip=$(cat /etc/nodepool/primary_node_private) sed -i "s/primary_private_ip/$primary_private_ip/" /etc/os-net-config/config.json - subnode_private_ip=$(cat /etc/nodepool/node_private) + subnode_private_ip=$(cat /etc/nodepool/sub_nodes_private) sed -i "s/subnode_private_ip/$subnode_private_ip/" /etc/os-net-config/config.json # We start with an arbitrarily high vni key so that we don't # overlap with Neutron created values. These will also match the # values that we've been using previously from the devstack-gate # code. vni=1000002 - subnode_index=$(grep -n $(cat /etc/nodepool/node_private) /etc/nodepool/sub_nodes_private | cut -d: -f1) + subnode_index=$(grep -n $(cat /etc/nodepool/sub_nodes_private) /etc/nodepool/sub_nodes_private | cut -d: -f1) let vni+=$subnode_index sed -i "s/vni/$vni/" /etc/os-net-config/config.json export interface_name="br-ex_$primary_private_ip" |