Merge pull request #582 from beagles/move-designate-kust-to-nodeset

Move designate kustomizations to nodeset for uni04delta

Apparently uni04delta generates controlplane CR from nodeset, so moving the designate related directives to there.

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

Author: softwarefactory-project-zuul[bot]

dt/uni04delta/edpm/nodeset/kustomization.yaml

@@ -189,3 +189,75 @@ replacements:
           - spec.services
         options:
           create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.neutron.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.neutron.template.customServiceConfig
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.designate-redis.replicas
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.redis.templates.designate-redis.replicas
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.designate-redis.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.redis.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.designate.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.designate.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.designate.bind9Services
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.designate.template.designateBackendbind9.override
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.designate.nsRecords
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.designate.template.nsRecords
+        options:
+          create: true

dt/uni04delta/kustomization.yaml

@@ -18,76 +18,3 @@ transformers:
 
 components:
   - ../../lib/control-plane
-
-replacements:
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.neutron.customServiceConfig
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.neutron.template.customServiceConfig
-        options:
-          create: true
-
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.designate-redis.replicas
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.redis.templates.designate-redis.replicas
-        options:
-          create: true
-
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.designate-redis.enabled
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.redis.enabled
-        options:
-          create: true
-
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.designate.enabled
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.designate.enabled
-        options:
-          create: true
-
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.designate.bind9Services
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.designate.template.designateBackendbind9.override
-        options:
-          create: true
-
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.designate.nsRecords
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.designate.template.nsRecords
-        options:
-          create: true