diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-21 11:38:51 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-09-22 15:00:30 +0000 |
| commit | 8cafb288943dd0ad9a29c6e7b3d7b22710a10f89 (patch) | |
| tree | da79b8da24bd2a1686b4f87384c5f2adb5ca23c9 /apex/tests/config | |
| parent | f9d02c076974168677bf5fdb02f26caf73924fb8 (diff) | |
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 <trozet@redhat.com>
(cherry picked from commit 17d5b541e93f5d88ff958372cdf0b0b184bdbc27)
Diffstat (limited to 'apex/tests/config')
| -rw-r--r-- | apex/tests/config/inventory-virt-1-node.yaml | 13 | ||||
| -rw-r--r-- | apex/tests/config/inventory-virt.yaml | 25 |
2 files changed, 38 insertions, 0 deletions
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 |