diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-06-02 07:19:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-02 07:19:28 +0000 |
| commit | 2498bbb0354fd7abbbb408810f419c2999c23a31 (patch) | |
| tree | 33f475b88cdbf97c97cb855740da7b41f9bed485 | |
| parent | 0ac1af6354f57c389b407cb1ea1e0365027704a6 (diff) | |
| parent | 09b0ac0860e274e53413f1c2eaf46b5eae8cd51a (diff) | |
Merge "Auto deploy corrections for Fuel 9.0"
| -rwxr-xr-x[-rw-r--r--] | deploy/deploy.py | 0 | ||||
| -rw-r--r-- | deploy/deploy_env.py | 3 | ||||
| -rw-r--r-- | deploy/install_fuel_master.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py index 742e76baa..742e76baa 100644..100755 --- a/deploy/deploy.py +++ b/deploy/deploy.py diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py index aa861e102..5eeaf11e0 100644 --- 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 4f6a0527b..631bf99b9 100644 --- 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' |