1 files changed, 1 insertions, 95 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
index 17c22c59e..11c23916f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
@@ -1,98 +1,4 @@
 classes:
-- system.linux.system.lowmem
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.memcached.server.single
-- system.rabbitmq.server.single
-- system.rabbitmq.server.vhost.openstack
-- system.keystone.server.wsgi
-- system.keystone.server.single
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
-- system.glance.control.single
-- system.nova.control.single
 - system.neutron.control.opendaylight.single
-- system.cinder.control.single
-- system.cinder.control.backend.lvm
-- system.heat.server.single
-- service.mysql.server.single
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.grafana
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.horizon.server.single
-- service.haproxy.proxy.single
-- cluster.virtual-mcp-ocata-common.haproxy_openstack_api
+- cluster.virtual-mcp-ocata-common.openstack_control
 - cluster.virtual-mcp-ocata-odl
-parameters:
-  _param:
-    linux_system_codename: xenial
-  linux:
-    system:
-      package:
-        python-msgpack:
-          version: latest
-    network:
-      interface:
-        ens4:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-        ens6:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:cluster_public_host}
-          netmask: 255.255.255.0
-  keystone:
-    server:
-      admin_email: ${_param:admin_email}
-      pkgs:
-      - keystone
-      - python-keystone
-      - python-keystoneclient
-      - python-psycopg2
-      - python-mysqldb
-      - python-six
-      - python-memcache
-      - python-openstackclient
-      - gettext-base
-      - python-pycadf
-  glance:
-    server:
-      storage:
-        engine: file
-      images: []
-      workers: 1
-  nova:
-    controller:
-      networking: dvr
-      cpu_allocation: 54
-      metadata:
-        password: ${_param:metadata_password}
-      bind:
-        private_address: ${_param:cluster_local_address}
-        public_address: ${_param:cluster_vip_address}
-        novncproxy_port: 6080
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
-      workers: 1
-  heat:
-    server:
-      bind:
-        api_cfn:
-          address: ${_param:single_address}
-        api_cloudwatch:
-          address: ${_param:single_address}
-  mysql:
-    server:
-      version: '5.7'
-      bind:
-        address: ${_param:cluster_local_address}