X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fbaremetal-mcp-ocata-ovs-ha%2Fopenstack%2Fcontrol.yml;h=d564171a74fe423b7e50630c4194074ddc800ffc;hb=refs%2Fchanges%2F29%2F45129%2F2;hp=1711ab0fe279a607e67c77ff3eb901f45dfe03e6;hpb=978fd9da91b6cdd522e79a4b8c31cf8f800222a3;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
index 1711ab0fe..d564171a7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
@@ -1,86 +1,5 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.ceilometer.client
-- system.memcached.server.single
-- system.keystone.server.cluster
-- system.keystone.server.wsgi
-- system.glance.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.nova.control.cluster
-- system.cinder.control.cluster
-- system.cinder.control.backend.lvm
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.bind.server.single
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.haproxy.proxy.listen.openstack.glare
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
-parameters:
-  _param:
-    keepalived_vip_interface: ens3
-    keepalived_vip_virtual_router_id: 50
-    cluster_vip_address: ${_param:openstack_control_address}
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: ctl01
-    cluster_node01_address: ${_param:openstack_control_node01_address}
-    cluster_node02_hostname: ctl02
-    cluster_node02_address: ${_param:openstack_control_node02_address}
-    cluster_node03_hostname: ctl03
-    cluster_node03_address: ${_param:openstack_control_node03_address}
-    nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-  linux:
-    network:
-      interface:
-        ens2: ${_param:linux_dhcp_interface}
-        ens3: ${_param:linux_single_interface}
-  keystone:
-    server:
-      cacert: /etc/ssl/certs/mcp_os_cacert
-  bind:
-    server:
-      control:
-        mgmt:
-          enabled: true
-          bind:
-            address: ${_param:single_address}
-            port: 953
-          allow:
-            - ${_param:openstack_control_node01_address}
-            - ${_param:openstack_control_node02_address}
-            - ${_param:openstack_control_node03_address}
-          keys:
-            - designate
-  designate:
-    server:
-      pools:
-        default:
-          description: 'test pool'
-          targets:
-            default:
-              description: 'test target1'
-            default1:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target2'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node02_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node02_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
-            default2:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target3'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node03_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node03_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
+  - system.neutron.control.openvswitch.cluster
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - cluster.baremetal-mcp-ocata-common.openstack_control