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)

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 39f76c0..3663ff0 100755 (executable)
--- 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 6058209..1552041 100644 (file)
--- 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 55d8fb6..3e34abe 100644 (file)
--- 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