diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-20 15:57:08 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-21 19:53:36 +0200 |
| commit | 6a997a36d07d9a3256139e3faea057ac54ddafd4 (patch) | |
| tree | b23fc31cd3f38f17cab187ba0ea641679fc44706 /mcp | |
| parent | d1e056ba8f3f848e267b460c827fe5c01f3fbc54 (diff) | |
[infra] Bind mas01 mcpcontrol DHCP to MAAS_IP
Bring back MAAS_IP global env var and use it for mas01 VM IP addr
in mcpcontrol network to prevent salt minion signature change.
Partially-reverts: b666bc50
Change-Id: I5c7668393fe66287bd3ecdc75dd3195d5a89a8f3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/reclass/classes/cluster/.gitignore | 4 | ||||
| -rw-r--r-- | mcp/scripts/globals.sh | 1 | ||||
| -rw-r--r-- | mcp/scripts/lib.sh | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index 9266b7cbc..0179ad987 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -6,7 +6,7 @@ mcp-common-ha/infra/init.yml all-mcp-arch-common/infra/maas.yml mcp-common-ha/infra/kvm_novcp.yml all-mcp-arch-common/opnfv/maas_proxy.yml -mcp-common-ha/openstack_control.yml +mcp-common-*/openstack_control.yml mcp-common-ha/openstack_telemetry.yml mcp*common-*/openstack_init.yml mcp-common-ha/openstack_interface_vcp_biport.yml @@ -15,7 +15,7 @@ mcp-common-ha/openstack_proxy.yml mcp-*-ha/infra/kvm.yml mcp-*-ha/infra/init_vcp.yml mcp-odl-ha/infra/maas.yml -mcp-odl-ha/opendaylight/control.yml +mcp-odl-*/opendaylight/control.yml mcp-odl-ha/openstack/init.yml mcp-odl-noha/infra/config.yml mcp-*-noha/openstack/compute.yml diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index d95448d45..629bac8ca 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -16,6 +16,7 @@ export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} # Derived from INSTALLER_IP export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0} export MCPCONTROL_PREFIX=${MCPCONTROL_PREFIX:-24} +export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3} # Derived from above global vars, not overideable export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}" diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index df35f3706..293262e89 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -463,6 +463,13 @@ function create_vms { done } +function update_mcpcontrol_network { + # set static ip address for salt master node, MaaS node + local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}') + [ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \ + "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live --config +} + function reset_vms { local vnodes=("$@") local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}" |