Merge pull request #561 from beagles/uni04delta-designate

Add designate to uni04delta

Adds the required network attachment and enables designate with defaults.

Reviewed-by: omersch381
Reviewed-by: Brent Eagles <[email protected]>
Reviewed-by: Andrew Bays <[email protected]>
Reviewed-by: John Fulton <[email protected]>

Author: softwarefactory-project-zuul[bot]

automation/net-env/uni04delta-adoption.yaml

@@ -191,6 +191,26 @@ instances:
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
+      designate:
+        interface_name: enp6s0.24
+        ip_v4: 172.26.0.10
+        mac_addr: '52:54:00:18:b0:f6'
+        mtu: 1500
+        network_name: designate
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 24
+        prefix_length_v4: 24
+      designateext:
+        interface_name: enp6s0.34
+        ip_v4: 172.34.0.10
+        mac_addr: '52:54:00:18:c0:f6'
+        mtu: 1500
+        network_name: designateext
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 34
+        prefix_length_v4: 24
       internalapi:
         interface_name: enp6s0.120
         ip_v4: 172.17.0.10
@@ -248,6 +268,26 @@ instances:
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
+      designate:
+        interface_name: enp6s0.24
+        ip_v4: 172.26.0.11
+        mac_addr: '52:54:00:18:b0:f7'
+        mtu: 1500
+        network_name: designate
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 24
+        prefix_length_v4: 24
+      designateext:
+        interface_name: enp6s0.34
+        ip_v4: 172.34.0.11
+        mac_addr: '52:54:00:18:c0:f7'
+        mtu: 1500
+        network_name: designateext
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 34
+        prefix_length_v4: 24
       internalapi:
         interface_name: enp6s0.120
         ip_v4: 172.17.0.11
@@ -305,6 +345,26 @@ instances:
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
+      designate:
+        interface_name: enp6s0.24
+        ip_v4: 172.26.0.12
+        mac_addr: '52:54:00:18:b0:f8'
+        mtu: 1500
+        network_name: designate
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 24
+        prefix_length_v4: 24
+      designateext:
+        interface_name: enp6s0.34
+        ip_v4: 172.34.0.12
+        mac_addr: '52:54:00:18:c0:f8'
+        mtu: 1500
+        network_name: designateext
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 34
+        prefix_length_v4: 24
       internalapi:
         interface_name: enp6s0.120
         ip_v4: 172.17.0.12
@@ -558,6 +618,70 @@ networks:
             start: 192.168.122.100
             start_host: 100
         ipv6_ranges: []
+  designate:
+    dns_v4: []
+    dns_v6: []
+    mtu: 1500
+    network_name: designate
+    network_v4: 172.26.0.0/24
+    search_domain: designate.example.com
+    tools:
+      metallb:
+        ipv4_ranges:
+          - end: 172.26.0.90
+            end_host: 90
+            length: 11
+            start: 172.26.0.80
+            start_host: 80
+            ipv6_ranges: []
+      multus:
+        ipv4_ranges:
+          - end: 172.26.0.70
+            end_host: 70
+            length: 41
+            start: 172.26.0.30
+            start_host: 30
+        ipv6_ranges: []
+      netconfig:
+        ipv4_ranges:
+          - end: 172.26.0.200
+            end_host: 200
+            length: 101
+            start: 172.26.0.100
+        ipv6_ranges: []
+    vlan_id: 24
+  designateext:
+    dns_v4: []
+    dns_v6: []
+    mtu: 1500
+    network_name: designateext
+    network_v4: 172.34.0.0/24
+    search_domain: designateext.example.com
+    tools:
+      metallb:
+        ipv4_ranges:
+          - end: 172.34.0.90
+            end_host: 90
+            length: 11
+            start: 172.34.0.80
+            start_host: 80
+            ipv6_ranges: []
+      multus:
+        ipv4_ranges:
+          - end: 172.34.0.70
+            end_host: 70
+            length: 41
+            start: 172.34.0.30
+            start_host: 30
+            ipv6_ranges: []
+      netconfig:
+        ipv4_ranges:
+          - end: 172.34.0.200
+            end_host: 200
+            length: 101
+            start: 172.34.0.100
+        ipv6_ranges: []
+    vlan_id: 34
   external:
     dns_v4:
       - 10.46.22.128

automation/net-env/uni04delta.yaml

@@ -191,6 +191,26 @@ instances:
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
+      designate:
+        interface_name: enp6s0.24
+        ip_v4: 172.26.0.10
+        mac_addr: '52:54:00:18:b0:f6'
+        mtu: 1500
+        network_name: designate
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 24
+        prefix_length_v4: 24
+      designateext:
+        interface_name: enp6s0.34
+        ip_v4: 172.34.0.10
+        mac_addr: '52:54:00:18:c0:f6'
+        mtu: 1500
+        network_name: designateext
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 34
+        prefix_length_v4: 24
       internalapi:
         interface_name: enp6s0.120
         ip_v4: 172.17.0.10
@@ -248,6 +268,26 @@ instances:
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
+      designate:
+        interface_name: enp6s0.24
+        ip_v4: 172.26.0.11
+        mac_addr: '52:54:00:18:b0:f7'
+        mtu: 1500
+        network_name: designate
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 24
+        prefix_length_v4: 24
+      designateext:
+        interface_name: enp6s0.34
+        ip_v4: 172.34.0.11
+        mac_addr: '52:54:00:18:c0:f7'
+        mtu: 1500
+        network_name: designateext
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 34
+        prefix_length_v4: 24
       internalapi:
         interface_name: enp6s0.120
         ip_v4: 172.17.0.11
@@ -305,6 +345,26 @@ instances:
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
+      designate:
+        interface_name: enp6s0.24
+        ip_v4: 172.26.0.12
+        mac_addr: '52:54:00:18:b0:f8'
+        mtu: 1500
+        network_name: designate
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 24
+        prefix_length_v4: 24
+      designateext:
+        interface_name: enp6s0.34
+        ip_v4: 172.34.0.12
+        mac_addr: '52:54:00:18:c0:f8'
+        mtu: 1500
+        network_name: designateext
+        parent_interface: enp6s0
+        skip_nm: false
+        vlan_id: 34
+        prefix_length_v4: 24
       internalapi:
         interface_name: enp6s0.120
         ip_v4: 172.17.0.12
@@ -558,6 +618,70 @@ networks:
             start: 192.168.122.100
             start_host: 100
         ipv6_ranges: []
+  designate:
+    dns_v4: []
+    dns_v6: []
+    mtu: 1500
+    network_name: designate
+    network_v4: 172.26.0.0/24
+    search_domain: designate.example.com
+    tools:
+      metallb:
+        ipv4_ranges:
+          - end: 172.26.0.90
+            end_host: 90
+            length: 11
+            start: 172.26.0.80
+            start_host: 80
+            ipv6_ranges: []
+      multus:
+        ipv4_ranges:
+          - end: 172.26.0.70
+            end_host: 70
+            length: 41
+            start: 172.26.0.30
+            start_host: 30
+        ipv6_ranges: []
+      netconfig:
+        ipv4_ranges:
+          - end: 172.26.0.200
+            end_host: 200
+            length: 101
+            start: 172.26.0.100
+        ipv6_ranges: []
+    vlan_id: 24
+  designateext:
+    dns_v4: []
+    dns_v6: []
+    mtu: 1500
+    network_name: designateext
+    network_v4: 172.34.0.0/24
+    search_domain: designateext.example.com
+    tools:
+      metallb:
+        ipv4_ranges:
+          - end: 172.34.0.90
+            end_host: 90
+            length: 11
+            start: 172.34.0.80
+            start_host: 80
+            ipv6_ranges: []
+      multus:
+        ipv4_ranges:
+          - end: 172.34.0.70
+            end_host: 70
+            length: 41
+            start: 172.34.0.30
+            start_host: 30
+            ipv6_ranges: []
+      netconfig:
+        ipv4_ranges:
+          - end: 172.34.0.200
+            end_host: 200
+            length: 101
+            start: 172.34.0.100
+        ipv6_ranges: []
+    vlan_id: 34
   external:
     dns_v4:
       - 10.46.22.128

dt/uni04delta/kustomization.yaml

@@ -31,3 +31,63 @@ replacements:
           - 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