From 28a693ccc50af393b821455ee5fa1de8a5f56cba Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Thu, 27 May 2021 14:53:26 +0000 Subject: [PATCH] Fix host-inventory cleanup The host-inventory entrypoint of the virtual-network-cloud site is using the old cleanup method, which has been removed. This change updates it to use the new cleanup function. This change also re-enables voting for the virtual-network-cloud deployment job. Signed-off-by: Drew Walters Change-Id: Ib09125a9c5e7c61f314f1962f89efef51c5ead58 --- .../hostgenerator/kustomization.yaml | 3 +-- .../target/catalogues/hosts.yaml | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/manifests/site/virtual-network-cloud/host-inventory/hostgenerator/kustomization.yaml b/manifests/site/virtual-network-cloud/host-inventory/hostgenerator/kustomization.yaml index df43263af..2acaa1c03 100644 --- a/manifests/site/virtual-network-cloud/host-inventory/hostgenerator/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/host-inventory/hostgenerator/kustomization.yaml @@ -7,5 +7,4 @@ resources: transformers: - ../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements - - ../../../../../../airshipctl/manifests/function/hostgenerator-m3/cleanup - - ../../target/catalogues/cleanup + - ../../../../function/treasuremap-cleanup diff --git a/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml b/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml index 1ad91deb6..9e2b2d98d 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml @@ -26,7 +26,7 @@ hosts: node02: bootMode: UEFI macAddress: 52:54:00:b6:ed:02 - bmcAddress: redfish+http://10.23.25.2:8000/redfish/v1/Systems/air-target-2 + bmcAddress: redfish+https://10.23.25.1:8443/redfish/v1/Systems/air-ephemeral bmcUsername: username bmcPassword: password disableCertificateVerification: false @@ -36,7 +36,7 @@ hosts: macAddresses: oam: 52:54:00:9b:27:02 pxe: 52:54:00:b6:ed:02 - hardwareProfile: default # defined in the hardwareprofile-example function + hardwareProfile: default node03: bootMode: UEFI macAddress: 52:54:00:b6:ed:23 @@ -51,3 +51,16 @@ hosts: oam: 52:54:00:9b:27:07 pxe: 52:54:00:b6:ed:23 hardwareProfile: default # defined in the hardwareprofile-example function + node04: + bootMode: UEFI + macAddress: 52:54:00:36:5e:e3 + bmcAddress: redfish+http://10.23.25.2:8000/redfish/v1/Systems/air-target-2 + bmcUsername: username + bmcPassword: password + ipAddresses: + oam-ipv4: 10.23.25.104 + pxe-ipv4: 10.23.24.104 + macAddresses: + oam: 52:54:00:dc:ab:04 + pxe: 52:54:00:51:0b:e4 + hardwareProfile: default # defined in the hardwareprofile-example function