openstack/tripleo-heat-templates
Code Issues Proposed changes

Don't assume single sub_node in nic config

Browse Source 
This nic config only works when there is one sub_node since we were
cat'ing /etc/nodepool/sub_nodes_private expecting to get a single IP
back. Instead, cat /etc/nodepool/node_private which will be the IP
address of the given sub_node.

Change-Id: I4958170b77838ea57c8f27531f70bf8d7a44302e
This commit is contained in:
James Slagle 2017-11-27 16:01:44 -05:00
parent b37b75790e
commit 86608ee51a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/common/net-config-multinode-os-net-config.yaml
View File

@ -56,14 +56,14 @@ resources:
function network_config_hook { function network_config_hook {
primary_private_ip=$(cat /etc/nodepool/primary_node_private) primary_private_ip=$(cat /etc/nodepool/primary_node_private)
sed -i "s/primary_private_ip/$primary_private_ip/" /etc/os-net-config/config.json sed -i "s/primary_private_ip/$primary_private_ip/" /etc/os-net-config/config.json
subnode_private_ip=$(cat /etc/nodepool/sub_nodes_private) subnode_private_ip=$(cat /etc/nodepool/node_private)
sed -i "s/subnode_private_ip/$subnode_private_ip/" /etc/os-net-config/config.json 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 # We start with an arbitrarily high vni key so that we don't
# overlap with Neutron created values. These will also match the # overlap with Neutron created values. These will also match the
# values that we've been using previously from the devstack-gate # values that we've been using previously from the devstack-gate
# code. # code.
vni=1000002 vni=1000002
subnode_index=$(grep -n $(cat /etc/nodepool/sub_nodes_private) /etc/nodepool/sub_nodes_private | cut -d: -f1) subnode_index=$(grep -n $(cat /etc/nodepool/node_private) /etc/nodepool/sub_nodes_private | cut -d: -f1)
let vni+=$subnode_index let vni+=$subnode_index
sed -i "s/vni/$vni/" /etc/os-net-config/config.json sed -i "s/vni/$vni/" /etc/os-net-config/config.json
export interface_name="br-ex_$primary_private_ip" export interface_name="br-ex_$primary_private_ip"