X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fmaas;h=47f66a451677ed19a8bc8281946bc8f0f54ce95a;hb=e821b9398a5a998bec0143d56efb93018b8bcd8c;hp=d6ef5a607916ae54e0534e96c4170aa1b068fe48;hpb=23f9ef727310a8ef449372313785241df6557559;p=fuel.git

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index d6ef5a607..47f66a451 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -1,6 +1,7 @@
 #!/bin/bash -e
+# shellcheck disable=SC1090
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -8,74 +9,47 @@
 ##############################################################################
 
 CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+ERASE_ENV=${ERASE_ENV:-0}
 
-# shellcheck disable=SC1090
+source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/globals.sh"
 source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 
-# Wait for MaaS commissioning/deploy to finish, retry on failure
-function maas_fixup() {
-  local statuscmd="salt 'mas01*' --out yaml state.apply maas.machines.status"
-  # shellcheck disable=SC2155
-  local ncount=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
-    grep -cE '^\s{2}\w+:$')
-  wait_for 180 "${statuscmd} | tee /dev/stderr | " \
-    "grep -Eq '((Deployed|Ready): ${ncount}|status:Failed|status:Allocated)'"
-  # shellcheck disable=SC2155
-  local statusout=$(eval "${statuscmd}")
-
-  # shellcheck disable=SC2155
-  local fcnodes=$(echo "${statusout}" | \
-    grep -Po '(?<=system_id:)(.*)(?=,status:Failed commissioning)')
-  for node_system_id in ${fcnodes}; do
-    salt -C 'mas01*' state.apply maas.machines.delete \
-      pillar="{'system_id': '${node_system_id}'}"
-    sleep 30
-  done
-  if [ -n "${fcnodes}" ]; then
-    salt -C 'mas01*' state.apply maas.machines
-    return 1
-  fi
+bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
+           awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); printf "%s ", $1}')
 
-  # shellcheck disable=SC2155
-  local fdnodes=$(echo "${statusout}" | \
-    grep -Po '(?<=system_id:)(.*)(?=,status:(Failed deployment|Allocated))')
-  for node_system_id in ${fdnodes}; do
-    salt -C 'mas01*' state.apply maas.machines.mark_broken_fixed \
-      pillar="{'system_id': '${node_system_id}'}"
-    sleep 30
+# Optionally destroy MaaS machines from a previous run
+if [ "${ERASE_ENV}" -gt 1 ]; then
+  cleanup_uefi
+  for node_hostname in ${bm_nodes//\*/}; do
+    salt -C 'mas01*' maasng.delete_machine "${node_hostname}" || true
   done
-  if [ -n "${fdnodes}" ]; then
-    salt -C 'mas01*' state.apply maas.machines.deploy
-    return 1
-  fi
-
-  return 0
-}
+fi
 
 # MaaS rack/region controller, node commissioning
-salt -C 'mas01*' cmd.run "add-apt-repository ppa:maas/stable"
-
-salt -C 'mas01*' state.apply linux,salt,openssh,ntp
-salt -C 'mas01*' state.apply linux.network.interface
-salt -C 'mas01*' state.apply maas.pxe_nat
+wait_for 10.0 "salt -C 'mas01*' state.apply linux,salt,openssh,ntp,iptables"
 salt -C 'mas01*' state.apply maas.cluster
-salt -C 'cfg01*' state.apply maas.pxe_route
 
 wait_for 10 "salt -C 'mas01*' state.apply maas.region"
 
-salt -C 'mas01*' state.apply maas.machines
-wait_for 10 maas_fixup
+if [ -n "${bm_nodes}" ]; then
+  salt -C 'mas01*' state.apply maas.machines
+fi
 
 # cleanup outdated salt keys
+sleep 30
 salt-key --out yaml | awk '!/^(minions|- cfg01|- mas01)/ {print $2}' | \
-  xargs -I{} salt-key -yd {}
+  xargs --no-run-if-empty -I{} salt-key -yd {}
 
 # MaaS node deployment
-salt -C 'mas01*' state.apply maas.machines.deploy
-wait_for 10 maas_fixup
-
-salt -C 'mas01*' pillar.item\
-  maas:region:admin:username \
-  maas:region:admin:password
-
-salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
+if [ -n "${bm_nodes}" ]; then
+  notify "[NOTE] MaaS operations might take a long time, please be patient" 2
+  salt -C 'mas01*' state.apply maas.machines.wait_for_ready_or_deployed
+  salt -C 'mas01*' state.apply maas.machines.storage
+  salt -C 'mas01*' state.apply maas.machines.deploy
+  salt -C 'mas01*' state.apply maas.machines.wait_for_deployed
+fi
+
+# Check all baremetal nodes are available
+wait_for 10.0 "(for n in ${bm_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
+
+wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"