From 0e9cd303cbf6d8003ce2ebdda2890e98f96eae7d Mon Sep 17 00:00:00 2001
From: Ruslan Aliev <raliev@mirantis.com>
Date: Thu, 12 Mar 2020 22:19:10 -0500
Subject: [PATCH] Fix network and cloud data for ephemeral host

Change-Id: I954971d52e708ae5e89d99dfc926f6570570f94a
---
 manifests/function/ephemeral/baremetal.yaml          |  6 ++++--
 manifests/function/ephemeral/secret.yaml             | 12 ++++++++++--
 .../templates/airshipconfig.j2                       |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/manifests/function/ephemeral/baremetal.yaml b/manifests/function/ephemeral/baremetal.yaml
index 892a5c0b9..972eb8ea2 100644
--- a/manifests/function/ephemeral/baremetal.yaml
+++ b/manifests/function/ephemeral/baremetal.yaml
@@ -7,7 +7,9 @@ metadata:
 spec:
   online: true
   bootMACAddress: 00:3b:8b:0c:ec:8b
-  networkData: "somedata: working data"
+  networkData:
+    name: ephemeral-network-data
+    namespace: default
   bmc:
     address: redfish+http://localhost:8000/redfish/v1/Systems/air-ephemeral
     credentialsName: master-0-bmc-secret
@@ -17,4 +19,4 @@ status:
 # 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
\ No newline at end of file
+    state: externally provisioned
diff --git a/manifests/function/ephemeral/secret.yaml b/manifests/function/ephemeral/secret.yaml
index 628bebbb6..b7701dc38 100644
--- a/manifests/function/ephemeral/secret.yaml
+++ b/manifests/function/ephemeral/secret.yaml
@@ -6,7 +6,7 @@ metadata:
   name: node1-bmc-secret
 type: Opaque
 stringData:
-  userdata: |
+  userData: |
     ssh_pwauth: True
     ssh_authorized_keys:
       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4tV63Q3HSSM4V9EInw/pq7dawz8dnAn93Ki8UMLkXIEv+Vby2d+24IddHZig3Tshyn8of5TSLOL0ysOA2Hphh26khBOzG/SGv4cyShj5QU0/Y1ONepyRmkjmi/UmYKBq1xnUSVzqwzz+GUqyMuTAO1hV5xaD80JhKH0YyOghh/N+eYE2m14D5oNDV0l2Hhxix90Lcl7GUQybV3VMsXFJ19KAJYUCQolGn9kWOV3l35FI3vBD4g11OP+1/XHS/4+qBEdK9PNr6kxd0HsYjbqi6JGh9+SB3PvCtzDlIhz9SfmjI7hjOrdJ1vuPcG1gvJSA1x5bcsLJvy91kQx7z6adH root@ubuntu-1
@@ -110,7 +110,15 @@ stringData:
     - mount --bind /mnt/vda/var/lib/docker /var/lib/docker
     - mkdir -p /var/lib/docker-engine /mnt/vda/var/lib/docker-engine
     - mount --bind /mnt/vda/var/lib/docker-engine /var/lib/docker-engine
-  netconfig: |
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ephemeral-network-data
+  namespace: default
+type: Opaque
+stringData:
+  networkData: |
     network:
       version: 1
       config:
diff --git a/roles/airshipctl-test-configs/templates/airshipconfig.j2 b/roles/airshipctl-test-configs/templates/airshipconfig.j2
index cf587e61d..ab15d7ad8 100644
--- a/roles/airshipctl-test-configs/templates/airshipconfig.j2
+++ b/roles/airshipctl-test-configs/templates/airshipconfig.j2
@@ -13,7 +13,7 @@ current-context: dummy_cluster
 kind: Config
 manifests:
   dummy_manifest:
-    primary-repository: primary
+    primary-repository-name: primary
     repositories:
       primary:
         checkout:
@@ -42,4 +42,4 @@ modules-config:
         networkConfigFileName: network-config
         outputMetadataFileName: output-metadata.yaml
 users:
-  dummy_user: {}
\ No newline at end of file
+  dummy_user: {}