From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Thu, 7 Dec 2017 07:56:28 +0000 (+0000)
Subject: Merge "lib.sh: persistent cfg01, mas01 mcpcontrol"
X-Git-Tag: opnfv-6.0.0~232
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a9fbe3c47a680eded71680a4ee3b77b5e82af3c6;p=fuel.git

Merge "lib.sh: persistent cfg01, mas01 mcpcontrol"
---

a9fbe3c47a680eded71680a4ee3b77b5e82af3c6
diff --cc mcp/scripts/lib.sh
index 8dd92e1ec,93ee59d0b..5a69609ba
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@@ -274,12 -139,14 +274,12 @@@ function create_vms 
  
  function update_mcpcontrol_network {
    # set static ip address for salt master node, MaaS node
 -  # shellcheck disable=SC2155
    local cmac=$(virsh domiflist cfg01 2>&1| awk '/mcpcontrol/ {print $5; exit}')
 -  # shellcheck disable=SC2155
    local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}')
    virsh net-update "mcpcontrol" add ip-dhcp-host \
-     "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live
+     "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live --config
    [ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \
-     "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live
+     "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live --config
  }
  
  function start_vms {