Merge "Integrate baremetal manager executor with manifest"

manifests/phases/executors.yaml

@@ -169,3 +169,17 @@ bootstrapContainer:
   image: quay.io/airshipit/capo-ephemeral:latest
   volume: /tmp:/kube
   saveKubeconfigFileName: capo.kubeconfig
+---
+apiVersion: airshipit.org/v1alpha1
+kind: BaremetalManager
+metadata:
+  name: RemoteDirectEphemeral
+  labels:
+    airshipit.org/deploy-k8s: "false"
+spec:
+  operation: remote-direct
+  hostSelector:
+    name: REPLACE_ME
+  operationOptions:
+    remoteDirect:
+      isoURL: REPLACE_ME

manifests/phases/phases.yaml

@@ -236,3 +236,13 @@ config:
     kind: GenericContainer
     name: encrypter
   documentEntryPoint: target/generator
+---
+apiVersion: airshipit.org/v1alpha1
+kind: Phase
+metadata:
+  name: remotedirect-ephemeral
+config:
+  executorRef:
+    apiVersion: airshipit.org/v1alpha1
+    kind: BaremetalManager
+    name: RemoteDirectEphemeral

manifests/site/test-site/phases/kustomization.yaml

@@ -1,3 +1,6 @@
 resources:
   - ../kubeconfig
   - ../../../phases
+## TODO Consider making a catalogue combined with variable substitution instead
+patchesStrategicMerge:
+  - phase-patch.yaml

manifests/site/test-site/phases/phase-patch.yaml

@@ -0,0 +1,10 @@
+apiVersion: airshipit.org/v1alpha1
+kind: BaremetalManager
+metadata:
+  name: RemoteDirectEphemeral
+spec:
+  hostSelector:
+    name: node02
+  operationOptions:
+    remoteDirect:
+      isoURL: http://localhost:8099/ephemeral.iso

tools/deployment/25_deploy_ephemeral_node.sh

@@ -18,14 +18,9 @@ set -xe
 export TIMEOUT=${TIMEOUT:-3600}
 export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"}
 export KUBECONFIG_EPHEMERAL_CONTEXT=${KUBECONFIG_EPHEMERAL_CONTEXT:-"ephemeral-cluster"}
-export EPHEMERAL_NODE=${EPHEMERAL_NODE:-"node02"}
-export ISO_URL=${ISO_URL:-"http://localhost:8099/ephemeral.iso"}
 
 echo "Deploy ephemeral node using redfish with iso"
-airshipctl baremetal remotedirect \
+airshipctl phase run remotedirect-ephemeral --debug
-  --iso-url $ISO_URL \
-  --name $EPHEMERAL_NODE \
-  --debug
 
 echo "Wait for apiserver to become available"
 N=0