Merge pull request #1173 from rebtoor/uni04delta-fixes

[uni04delta] Remove Designate networks

Author: openshift-merge-bot[bot]

scenarios/uni04delta.yaml

@@ -75,8 +75,6 @@ stacks:
         gathering: implicit
         inventory: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/data-plane-adoption'].
                     src_dir }}/scenarios/uni04delta/ceph_inventory.yaml"
-        extra_vars:
-          cifmw_ceph_ipv6: false
       - name: 03 Create external Ceph parameters file
         type: playbook
         source: "create_external_ceph_params.yml"

scenarios/uni04delta/config_download.yaml

@@ -12,8 +12,6 @@ resource_registry:
   OS::TripleO::Controller::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage_mgmt.yaml
   OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
   OS::TripleO::Controller::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_external.yaml
-  OS::TripleO::Controller::Ports::DesignatePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_designate.yaml
-  OS::TripleO::Controller::Ports::DesignateExtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_designateext.yaml
   OS::TripleO::Services::CeilometerAgentCentral: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentNotification: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentIpmi: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

scenarios/uni04delta/network_data.yaml.j2

@@ -57,25 +57,3 @@
       vlan: 23
       ip_subnet: '172.20.0.0/24'
       allocation_pools: [{'start': '172.20.0.120', 'end': '172.20.0.250'}]
-
-- name: Designate
-  mtu: 1500
-  vip: false
-  name_lower: designate
-  dns_domain: designate.{{ cloud_domain }}.
-  subnets:
-    designate_subnet:
-      vlan: 24
-      ip_subnet: '172.21.0.0/24'
-      allocation_pools: [{'start': '172.21.0.120', 'end': '172.21.0.250'}]
-
-- name: Designateext
-  mtu: 1500
-  vip: false
-  name_lower: designateext
-  dns_domain: designateext.{{ cloud_domain }}.
-  subnets:
-    designateext_subnet:
-      vlan: 25
-      ip_subnet: '172.23.0.0/24'
-      allocation_pools: [{'start': '172.23.0.120', 'end': '172.23.0.250'}]

scenarios/uni04delta/roles.yaml

@@ -24,10 +24,6 @@
       subnet: tenant_subnet
     External:
       subnet: external_subnet
-    Designate:
-      subnet: designate_subnet
-    Designateext:
-      subnet: designateext_subnet
   # For systems with both IPv4 and IPv6, you may specify a gateway network for
   # each, such as ['ControlPlane', 'External']
   default_route_networks: ['ControlPlane']
@@ -89,13 +85,6 @@
     - OS::TripleO::Services::Clustercheck
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::ContainerImagePrepare
-    - OS::TripleO::Services::DesignateApi
-    - OS::TripleO::Services::DesignateCentral
-    - OS::TripleO::Services::DesignateProducer
-    - OS::TripleO::Services::DesignateWorker
-    - OS::TripleO::Services::DesignateMDNS
-    - OS::TripleO::Services::DesignateSink
-    - OS::TripleO::Services::DesignateBind
     - OS::TripleO::Services::Etcd
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Frr