diff options
author | Dan Radez <dradez@redhat.com> | 2017-03-30 23:03:43 -0400 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2017-05-09 15:09:42 -0400 |
commit | ac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 (patch) | |
tree | ed0c27aa4853848b0e47e3ce3de25dfb23bfc8df /lib/python/apex | |
parent | ef3dc1ce0323fa0881e416cd4b9028fb4250b719 (diff) |
Updating Apex to OpenStack Ocata
- power management updated to virtualbmc, pxe_ssh is deprecated
- removing custom tacker build
- removing custom congress build
- disabling yum update in undercloud on the cli instead of in a patch
- Undercloud is direct kernel booted now, there are no kernel and initrd
in the disk image from upstream
- remove OpenDaylight previous to Carbon
JIRA: APEX-433
JIRA: APEX-432
JIRA: APEX-431
Change-Id: I6963f16e65eacade5607a3082b58b6150331406c
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'lib/python/apex')
-rw-r--r-- | lib/python/apex/inventory.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/python/apex/inventory.py b/lib/python/apex/inventory.py index ce16ef41..2e08d3b9 100644 --- a/lib/python/apex/inventory.py +++ b/lib/python/apex/inventory.py @@ -43,6 +43,8 @@ class Inventory(dict): node['pm_password'] = node['ipmi_pass'] node['pm_user'] = node['ipmi_user'] node['mac'] = [node['mac_address']] + if 'cpus' in node: + node['cpu'] = node['cpus'] for i in ('ipmi_ip', 'ipmi_pass', 'ipmi_user', 'mac_address', 'disk_device'): |