Merge pull request #618 from fultonj/dz-storage-nova-ssh

Fix nova-migration-ssh-key dataSources in dz-storage

In f91b85b the nova service was switched from the default "nova" service to the custom "nova-custom-az*" services. The dataSources was incorrectly nested under tlsCerts.default. This change moves it to where it belongs at the spec level.

Reviewed-by: Andrew Bays <[email protected]>

Author: softwarefactory-project-zuul[bot]

examples/dt/dz-storage/edpm/computes/r0/nova-custom-az0.yaml

@@ -8,6 +8,13 @@ spec:
   caCerts: combined-ca-bundle
   edpmServiceType: nova
   playbook: osp.edpm.nova
+  dataSources:
+    - configMapRef:
+        name: nova-extra-config-az0
+    - secretRef:
+        name: nova-migration-ssh-key
+    - secretRef:
+        name: nova-cell1-compute-config
   tlsCerts:
     default:
       contents:
@@ -17,10 +24,3 @@ spec:
       issuer: osp-rootca-issuer-internal
       networks:
         - ctlplane
-      dataSources:
-        - configMapRef:
-            name: nova-extra-config-az0
-        - secretRef:
-            name: nova-migration-ssh-key
-        - secretRef:
-            name: nova-cell1-compute-config

examples/dt/dz-storage/edpm/computes/r1/nova-custom-az1.yaml

@@ -8,6 +8,13 @@ spec:
   caCerts: combined-ca-bundle
   edpmServiceType: nova
   playbook: osp.edpm.nova
+  dataSources:
+    - configMapRef:
+        name: nova-extra-config-az1
+    - secretRef:
+        name: nova-migration-ssh-key
+    - secretRef:
+        name: nova-cell1-compute-config
   tlsCerts:
     default:
       contents:
@@ -17,10 +24,3 @@ spec:
       issuer: osp-rootca-issuer-internal
       networks:
         - ctlplane
-      dataSources:
-        - configMapRef:
-            name: nova-extra-config-az1
-        - secretRef:
-            name: nova-migration-ssh-key
-        - secretRef:
-            name: nova-cell1-compute-config

examples/dt/dz-storage/edpm/computes/r2/nova-custom-az2.yaml

@@ -8,6 +8,13 @@ spec:
   caCerts: combined-ca-bundle
   edpmServiceType: nova
   playbook: osp.edpm.nova
+  dataSources:
+    - configMapRef:
+        name: nova-extra-config-az2
+    - secretRef:
+        name: nova-migration-ssh-key
+    - secretRef:
+        name: nova-cell1-compute-config
   tlsCerts:
     default:
       contents:
@@ -17,10 +24,3 @@ spec:
       issuer: osp-rootca-issuer-internal
       networks:
         - ctlplane
-      dataSources:
-        - configMapRef:
-            name: nova-extra-config-az2
-        - secretRef:
-            name: nova-migration-ssh-key
-        - secretRef:
-            name: nova-cell1-compute-config