Auto deploy corrections for Fuel 9.0

- The auto deployer's detection of nodes being up corrected as "fuel node"
  now returns "1" instead of "True" to denote that the node is up.

- The location of bootstrap_admin_node.sh has changed so the detection of
  whether the Fuel node installation needed a correction for the deployer
  not to throw an exit code and terminate prematurely.

- Small fix: deploy.py is now executable (just a chmod change).

Change-Id: I8fed7bafe6912f8b4278619bbdaa16577a82737b
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>

diff --git a/deploy/deploy.py b/deploy/deploy.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py
index aa861e1..5eeaf11 100644 (file)
--- a/deploy/deploy_env.py
+++ b/deploy/deploy_env.py
@@ -216,7 +216,8 @@ class CloudDeploy(object):
     def node_discovery(self, node_list, discovered_macs):
         for node in node_list:
             if (node[N['status']] == 'discover' and
-                node[N['online']] == 'True' and
+                (node[N['online']] == 'True' or
+                node[N['online']] == '1') and
                 node[N['mac']] not in discovered_macs):
                 discovered_macs.append(node[N['mac']])
                 blade = self.find_mac_in_dict(node[N['mac']])

diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py
index 4f6a052..631bf99 100644 (file)
--- a/deploy/install_fuel_master.py
+++ b/deploy/install_fuel_master.py
@@ -21,7 +21,7 @@ from common import (
 )
 
 TRANSPLANT_FUEL_SETTINGS = 'transplant_fuel_settings.py'
-BOOTSTRAP_ADMIN = '/usr/local/sbin/bootstrap_admin_node'
+BOOTSTRAP_ADMIN = 'bootstrap_admin_node'
 FUEL_CLIENT_CONFIG = '/etc/fuel/client/config.yaml'
 PLUGINS_DIR = '~/plugins'
 LOCAL_PLUGIN_FOLDER = '/opt/opnfv'