diff options
| author |   Michael Chapman <woppin@gmail.com> | 2016-02-12 14:48:41 +1100 |
|---|---|---|
| committer |   Dan Radez <dradez@redhat.com> | 2016-02-13 14:43:32 +0000 |
| commit | e0da983af0f1867d54f1a70845a85693d3c04ab8 (patch) | |
| tree | a2535b3fadfdae17a766514ef0e2f59b01637f64 | |
| parent | a22f3f2b3bede26173e19198a77153e63fafd23f (diff) | |
Support power management type changes
JIRA: APEX-95
pm_type is already in the sample instackenv.json but wasn't previously
being read.
Change-Id: Ia82c5010481d77d142d4fa3ca6e738558e8e9e4e
(cherry picked from commit 652104ebd6c0d0baba22ffc6486512ade19c043d)
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rw-r--r-- | config/inventory/intel_pod2_settings.yaml | 5 | ||||
| -rw-r--r-- | config/inventory/pod_example_settings.yaml | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 39f76c03..3663ff0a 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -316,7 +316,7 @@ parse_inventory_file() { node_output=" { \"pm_password\": \"$(eval echo \${${node}ipmi_pass})\", - \"pm_type\": \"pxe_ipmitool\", + \"pm_type\": \"$(eval echo \${${node}pm_type})\", \"mac\": [ \"$(eval echo \${${node}mac_address})\" ], diff --git a/config/inventory/intel_pod2_settings.yaml b/config/inventory/intel_pod2_settings.yaml index 6058209d..15520410 100644 --- a/config/inventory/intel_pod2_settings.yaml +++ b/config/inventory/intel_pod2_settings.yaml @@ -4,6 +4,7 @@ nodes: ipmi_ip: 10.4.7.2 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -14,6 +15,7 @@ nodes: ipmi_ip: 10.4.7.3 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -24,6 +26,7 @@ nodes: ipmi_ip: 10.4.7.4 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -34,6 +37,7 @@ nodes: ipmi_ip: 10.4.7.5 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -44,6 +48,7 @@ nodes: ipmi_ip: 10.4.7.6 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 diff --git a/config/inventory/pod_example_settings.yaml b/config/inventory/pod_example_settings.yaml index 55d8fb61..3e34abe9 100644 --- a/config/inventory/pod_example_settings.yaml +++ b/config/inventory/pod_example_settings.yaml @@ -4,6 +4,7 @@ nodes: ipmi_ip: 10.4.17.2 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -14,6 +15,7 @@ nodes: ipmi_ip: 10.4.17.3 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -24,6 +26,7 @@ nodes: ipmi_ip: 10.4.17.4 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -34,6 +37,7 @@ nodes: ipmi_ip: 10.4.17.5 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 @@ -44,6 +48,7 @@ nodes: ipmi_ip: 10.4.17.6 ipmi_user: root ipmi_pass: root + pm_type: "pxe_ipmitool" cpus: 2 memory: 8192 disk: 40 |