From ce3dcec6fef10f54af1478f35d55840727226b95 Mon Sep 17 00:00:00 2001
From: Kostiantyn Kalynovskyi <kkalinovskiy@gmail.com>
Date: Wed, 27 Jan 2021 23:38:49 +0000
Subject: [PATCH] remove redundant ephemeral host patch

Change-Id: Ie451d82cf87d72b1c21fbe588b92aec7f017becc
---
 .../host-inventory/ephemeral-patch.yaml       | 20 -------------------
 .../hostgenerator/host-generation.yaml        |  1 +
 .../host-inventory/kustomization.yaml         |  3 ---
 .../test-site/target/catalogues/hosts.yaml    |  2 +-
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 manifests/site/test-site/host-inventory/ephemeral-patch.yaml

diff --git a/manifests/site/test-site/host-inventory/ephemeral-patch.yaml b/manifests/site/test-site/host-inventory/ephemeral-patch.yaml
deleted file mode 100644
index 7d8282cc8..000000000
--- a/manifests/site/test-site/host-inventory/ephemeral-patch.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# This patches the node02 BMH to be suitable for ephemeral purposes
-apiVersion: metal3.io/v1alpha1
-kind: BareMetalHost
-metadata:
-  annotations:
-  labels:
-    airshipit.org/ephemeral-node: "true"
-    airshipit.org/deploy-k8s: "false"
-  name: node02
-spec:
-  online: true
-  bmc:
-    address: redfish+https://localhost:8443/redfish/v1/Systems/air-ephemeral
-status:
-  provisioning:
-# we need this status to make sure, that the host is not going to be
-# reprovisioned by the ephemeral baremetal operator.
-# when we have more flexible labeling system in place, we will not
-# deliver this document to ephemeral cluster
-    state: externally provisioned
diff --git a/manifests/site/test-site/host-inventory/hostgenerator/host-generation.yaml b/manifests/site/test-site/host-inventory/hostgenerator/host-generation.yaml
index c2b762af4..7ec14d69d 100644
--- a/manifests/site/test-site/host-inventory/hostgenerator/host-generation.yaml
+++ b/manifests/site/test-site/host-inventory/hostgenerator/host-generation.yaml
@@ -12,3 +12,4 @@ hosts:
     - node01
     - node02
     - node03
+    - node04
diff --git a/manifests/site/test-site/host-inventory/kustomization.yaml b/manifests/site/test-site/host-inventory/kustomization.yaml
index 848ce20c7..0c3b6f854 100644
--- a/manifests/site/test-site/host-inventory/kustomization.yaml
+++ b/manifests/site/test-site/host-inventory/kustomization.yaml
@@ -3,6 +3,3 @@ kind: Kustomization
 
 generators:
   - hostgenerator
-
-patchesStrategicMerge:
-  - ephemeral-patch.yaml
\ No newline at end of file
diff --git a/manifests/site/test-site/target/catalogues/hosts.yaml b/manifests/site/test-site/target/catalogues/hosts.yaml
index 74d979d33..dcbea59c4 100644
--- a/manifests/site/test-site/target/catalogues/hosts.yaml
+++ b/manifests/site/test-site/target/catalogues/hosts.yaml
@@ -26,7 +26,7 @@ hosts:
     node02:
       bootMode: UEFI
       macAddress: 52:54:00:b6:ed:02
-      bmcAddress: redfish+https://localhost:8443/redfish/v1/Systems/air-ephemeral
+      bmcAddress: redfish+https://10.23.25.1:8443/redfish/v1/Systems/air-ephemeral
       bmcUsername: username
       bmcPassword: password
       disableCertificateVerification: false