diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-09-21 19:05:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-21 19:05:21 +0000 |
| commit | 7de7172ad88dd968de5c911b6858c0660c5b747b (patch) | |
| tree | e5e5c1a4d2846b4621a501d8120d2a8b207896e1 /fuel/deploy | |
| parent | 3f42e219d2b2e531a9aa9722ee795cb3a686a017 (diff) | |
| parent | 7972d9699abd16bd115ff1b440e057131178efd6 (diff) | |
Merge "Grant access for Fuel VM to external public network" into stable/arno
Diffstat (limited to 'fuel/deploy')
| -rw-r--r-- | fuel/deploy/deploy_env.py | 7 | ||||
| -rw-r--r-- | fuel/deploy/install_fuel_master.py | 2 | ||||
| -rw-r--r-- | fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml | 10 |
3 files changed, 10 insertions, 9 deletions
diff --git a/fuel/deploy/deploy_env.py b/fuel/deploy/deploy_env.py index fb3cf12..be8bed3 100644 --- a/fuel/deploy/deploy_env.py +++ b/fuel/deploy/deploy_env.py @@ -88,9 +88,10 @@ class CloudDeploy(object): blade_node_file = '%s/%s' % ( self.work_dir, os.path.basename(self.blade_node_file)) with self.ssh as s: - status = s.run('python %s %s %s %s' - % (('-nh' if self.no_health_check else ''), - deploy_app, dea_file, blade_node_file)) + status = s.run( + 'python %s %s %s %s' % ( + deploy_app, ('-nh' if self.no_health_check else ''), + dea_file, blade_node_file)) return status def check_supported_release(self): diff --git a/fuel/deploy/install_fuel_master.py b/fuel/deploy/install_fuel_master.py index b4e12d4..acacf37 100644 --- a/fuel/deploy/install_fuel_master.py +++ b/fuel/deploy/install_fuel_master.py @@ -115,7 +115,7 @@ class InstallFuelMaster(object): r, e = s.exec_cmd('fuel plugins --install %s' % f, False) if e and 'does not update installed package' not in r: raise Exception('Installation of Fuel Plugin %s ' - 'failed' % f) + 'failed: %s' % (f, e)) def wait_for_node_up(self): WAIT_LOOP = 60 diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml index aa0c6d7..cfc9709 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml +++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml @@ -12,27 +12,27 @@ adapter: ipmi nodes: - id: 1 - pxeMac: 00:25:B5:A0:00:2A + pxeMac: 00:25:b5:a0:00:2a ipmiIp: 172.30.8.75 ipmiUser: admin ipmiPass: octopus - id: 2 - pxeMac: 00:25:B5:A0:00:3A + pxeMac: 00:25:b5:a0:00:3a ipmiIp: 172.30.8.65 ipmiUser: admin ipmiPass: octopus - id: 3 - pxeMac: 00:25:B5:A0:00:4A + pxeMac: 00:25:b5:a0:00:4a ipmiIp: 172.30.8.74 ipmiUser: admin ipmiPass: octopus - id: 4 - pxeMac: 00:25:B5:A0:00:5A + pxeMac: 00:25:b5:a0:00:5a ipmiIp: 172.30.8.73 ipmiUser: admin ipmiPass: octopus - id: 5 - pxeMac: 00:25:B5:A0:00:6A + pxeMac: 00:25:b5:a0:00:6a ipmiIp: 172.30.8.72 ipmiUser: admin ipmiPass: octopus |