summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-21 13:33:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-21 13:33:15 +0000
commit7099ffcba4c7a84dfd2ac53fd59149948665f884 (patch)
treefe68e49cf2a320020479528068d4da849e44d085
parent857797a2c50d20299dac43135bd8f688905b9d37 (diff)
parentdae5c2c5e677e4af8e56370c10316219a539321e (diff)
Merge "[infra] Bind mas01 mcpcontrol DHCP to MAAS_IP"
-rwxr-xr-xci/deploy.sh1
-rw-r--r--mcp/reclass/classes/cluster/.gitignore4
-rw-r--r--mcp/scripts/globals.sh1
-rw-r--r--mcp/scripts/lib.sh7
4 files changed, 11 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 103f83b9e..41ac60237 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -308,6 +308,7 @@ else
do_sysctl_cfg
do_udev_cfg
create_vms "${MCP_STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}"
+ update_mcpcontrol_network
start_vms "${virtual_nodes[@]}"
# https://github.com/docker/libnetwork/issues/1743
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}"