From 17d5b541e93f5d88ff958372cdf0b0b184bdbc27 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 21 Sep 2017 11:38:51 -0400 Subject: Fixes removing inventory keys Inventory keys that we want to delete were not being removed for instackenv.json. Also fixes unit tests. Change-Id: I7d6c752342db050d651953633f18e236f60334e3 Signed-off-by: Tim Rozet --- apex/tests/config/inventory-virt-1-node.yaml | 13 +++++++++++++ apex/tests/config/inventory-virt.yaml | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 apex/tests/config/inventory-virt-1-node.yaml create mode 100644 apex/tests/config/inventory-virt.yaml (limited to 'apex/tests/config') diff --git a/apex/tests/config/inventory-virt-1-node.yaml b/apex/tests/config/inventory-virt-1-node.yaml new file mode 100644 index 00000000..3e4b8dc4 --- /dev/null +++ b/apex/tests/config/inventory-virt-1-node.yaml @@ -0,0 +1,13 @@ +nodes: + node0: + arch: x86_64 + capabilities: profile:control + cpu: 4 + disk: 41 + ipmi_ip: 192.168.122.1 + ipmi_pass: password + ipmi_user: admin + mac_address: 00:a8:58:29:f9:99 + memory: 10240 + pm_port: 6230 + pm_type: pxe_ipmitool diff --git a/apex/tests/config/inventory-virt.yaml b/apex/tests/config/inventory-virt.yaml new file mode 100644 index 00000000..36184ea5 --- /dev/null +++ b/apex/tests/config/inventory-virt.yaml @@ -0,0 +1,25 @@ +nodes: + node0: + arch: x86_64 + capabilities: profile:control + cpu: 4 + disk: 41 + ipmi_ip: 192.168.122.1 + ipmi_pass: password + ipmi_user: admin + mac_address: 00:a8:58:29:f9:99 + memory: 10240 + pm_port: 6230 + pm_type: pxe_ipmitool + node1: + arch: x86_64 + capabilities: profile:compute + cpu: 4 + disk: 41 + ipmi_ip: 192.168.122.1 + ipmi_pass: password + ipmi_user: admin + mac_address: 00:9d:c8:10:d9:64 + memory: 8192 + pm_port: 6231 + pm_type: pxe_ipmitool -- cgit 1.2.3-korg