reclass: baremetal: Factor out common code

While at it, add .yamllint file (copied from releng repo).

Change-Id: I39630c0043fe2fd601510969c401e6cc9efbf69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit a75af3d4c30af050dd15c0f875142f6328874fe4)

9 files changed, 11 insertions, 609 deletions

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
index 758fa3ffc..51b62e3a1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
@@ -1,12 +1,4 @@
 ---
 classes:
   - cluster.baremetal-mcp-ocata-odl-ha
-parameters:
-  _param:
-    dhcp_nic: eth0
-    single_nic: eth1
-  linux:
-    network:
-      interface:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
+  - cluster.baremetal-mcp-ocata-common.openstack_benchmark
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 032dd8452..590241e8d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -1,37 +1,11 @@
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - system.linux.storage.loopback
-  - system.glusterfs.client.cluster
-  - system.nova.compute.cluster
-  - system.nova.compute.nfv.hugepages
-  - system.nova.compute.nfv.cpu_pinning
-  - system.neutron.gateway.opendaylight.single
-  - system.neutron.gateway.cluster
-  - system.cinder.volume.single
-  - system.cinder.volume.backend.lvm
-  - system.ceilometer.agent.cluster
+  - cluster.baremetal-mcp-ocata-common.openstack_compute
   - cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.neutron.gateway.opendaylight.single
 parameters:
   _param:
-    cluster_vip_address: ${_param:openstack_control_address}
-    cluster_local_address: ${_param:control_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
-    mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
     tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
-    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
-    interface_mtu: 1500
-    keepalived_vip_interface: br-ctl
-    keepalived_vip_virtual_router_id: 69
-    loopback_device_size: 20
-    linux_system_codename: xenial
     neutron_agents:
       - neutron-dhcp-agent
       - neutron-metadata-agent
@@ -48,41 +22,14 @@ parameters:
       services: ${_param:neutron_agents}
       backend:
         router: ${_param:opendaylight_router}
-  glusterfs:
-    client:
-      volumes:
-        nova_instances:
-          path: /var/lib/nova/instances
-          server: ${_param:glusterfs_service_host}
-          user: nova
-          group: nova
-          # yamllint disable-line rule:line-length
-          opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
-    system:
-      kernel:
-        sysctl:
-          vm.dirty_ratio: 10
-          vm.dirty_background_ratio: 5
     network:
-      bridge: openvswitch
       interface:
-        mgmt_nic:
-          enabled: true
-          type: eth
-          proto: dhcp
-          name: ${_param:mgmt_nic}
         tenant_nic:
           enabled: true
           type: eth
           proto: manual
           name: ${_param:tenant_nic}
-        external_nic:
-          enabled: true
-          name: ${_param:external_nic}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
         br-mesh:
           enabled: true
           type: bridge
@@ -91,13 +38,6 @@ parameters:
           mtu: 1500
           use_interfaces:
             - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
-        mgmt-vlan:
-          enabled: true
-          proto: manual
-          type: vlan
-          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-          use_interfaces:
-            - ${_param:mgmt_nic}
         tenant-vlan:
           enabled: true
           proto: manual
@@ -105,30 +45,3 @@ parameters:
           name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
           use_interfaces:
             - ${_param:tenant_nic}
-        br-ctl:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-        br-floating:
-          enabled: true
-          type: ovs_bridge
-          mtu: ${_param:interface_mtu}
-        float-to-ex:
-          enabled: true
-          type: ovs_port
-          mtu: ${_param:interface_mtu}
-          bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          address: ${_param:external_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:external_nic}
-          use_ovs_ports:
-            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
index 9da1f03da..58806b993 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
@@ -1,90 +1,10 @@
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - system.ceilometer.client
-  - system.memcached.server.single
-  - system.keystone.server.cluster
-  - system.keystone.server.wsgi
-  - system.glance.control.cluster
   - system.neutron.control.opendaylight.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-odl-ha.infra
+  - cluster.baremetal-mcp-ocata-common.openstack_control
 parameters:
-  _param:
-    keepalived_vip_interface: ${_param:single_nic}
-    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:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
-  keystone:
-    server:
-      cacert: /etc/ssl/certs/mcp_os_cacert
   neutron:
     server:
       backend:
         router: ${_param:opendaylight_router}
-  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
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
index e70aab514..a1c00a131 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
@@ -1,12 +1,4 @@
 ---
 classes:
-  - system.horizon.server.single
   - cluster.baremetal-mcp-ocata-odl-ha
-parameters:
-  _param:
-    horizon_site_branding: OpenStack Dashboard
-  linux:
-    network:
-      interface:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
+  - cluster.baremetal-mcp-ocata-common.openstack_dashboard
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
index fc783d1b4..b833d3076 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
@@ -1,36 +1,4 @@
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - system.galera.server.cluster
-  - system.galera.server.database.aodh
-  - system.galera.server.database.ceilometer
-  - system.galera.server.database.cinder
-  - system.galera.server.database.designate
-  - 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.galera.server.database.neutron
   - cluster.baremetal-mcp-ocata-odl-ha
-parameters:
-  _param:
-    keepalived_vip_interface: ${_param:single_nic}
-    keepalived_vip_virtual_router_id: 80
-    galera_server_cluster_name: openstack_cluster
-    galera_max_connections: 3072
-    galera_innodb_buffer_pool_size: 2048M
-    cluster_vip_address: ${_param:openstack_database_address}
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: dbs01
-    cluster_node01_address: ${_param:openstack_database_node01_address}
-    cluster_node02_hostname: dbs02
-    cluster_node02_address: ${_param:openstack_database_node02_address}
-    cluster_node03_hostname: dbs03
-    cluster_node03_address: ${_param:openstack_database_node03_address}
-  linux:
-    network:
-      interface:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
+  - cluster.baremetal-mcp-ocata-common.openstack_database
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
index c7df472d3..b3032b6a2 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
@@ -1,203 +1,20 @@
 ---
-# yamllint disable rule:line-length
+classes:
+  - cluster.baremetal-mcp-ocata-common.openstack_init
 parameters:
   _param:
-
-    openstack_version: ocata
-
-    openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
-    openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
-    openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
-    openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
-    openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
-    openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
-    openstack_gateway_node01_hostname: gtw01
-    openstack_gateway_node02_hostname: gtw02
-    openstack_gateway_node03_hostname: gtw03
-
-    # openstack service addresses
-    openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
-    openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
-    openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
-    openstack_control_address: ${_param:opnfv_openstack_control_address}
-    openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
-    openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
-    openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
-    openstack_database_address: ${_param:opnfv_openstack_database_address}
-    openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
-    openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
-    openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
-    openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
-    openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
-    openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
-    openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
-
-
-    openstack_telemetry_hostname: mdb
-    openstack_telemetry_node01_hostname: mdb01
-    openstack_telemetry_node02_hostname: mdb02
-    openstack_telemetry_node03_hostname: mdb03
-
-    openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
-    openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
-    openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
-    openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
-
-    # OpenStack Compute
-    openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
-    openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
-    openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
-    openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
-    openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
-    openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
-    openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
-    openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
-    openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
-    openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
-    openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
-
     # opendaylight options
     opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
     opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
     opendaylight_server_node01_hostname: odl01
     opendaylight_router: odl-router_v2
 
-    # openstack service hostnames
-    openstack_proxy_hostname: prx
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node02_hostname: prx02
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
-    openstack_database_hostname: dbs
-    openstack_database_node01_hostname: dbs01
-    openstack_database_node02_hostname: dbs02
-    openstack_database_node03_hostname: dbs03
-    openstack_message_queue_hostname: msg
-    openstack_message_queue_node01_hostname: msg01
-    openstack_message_queue_node02_hostname: msg02
-    openstack_message_queue_node03_hostname: msg03
-
-    # openstack compute
-    openstack_compute_node01_hostname: cmp001
-    openstack_compute_node02_hostname: cmp002
-
-    openstack_region: RegionOne
-    admin_email: root@localhost
-    # Neutron osv/nodvr
-    neutron_control_dvr: 'False'
     neutron_tenant_network_types: "flat,vxlan"
-    neutron_l3_ha: 'True'
-    neutron_global_physnet_mtu: 1500
-    neutron_external_mtu: 1500
-    neutron_gateway_dvr: 'False'
-    neutron_gateway_agent_mode: legacy
-    neutron_compute_dvr: 'False'
-    neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: 'True'
-    galera_server_cluster_name: openstack_cluster
-    galera_server_maintenance_password: opnfv_secret
-    galera_server_admin_password: opnfv_secret
-    rabbitmq_secret_key: opnfv_secret
-    rabbitmq_admin_password: opnfv_secret
-    rabbitmq_openstack_password: opnfv_secret
     nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
     compute_hugepages_size: 1G
     compute_hugepages_count: 16
     compute_hugepages_mount: /mnt/hugepages_1G
     compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-    glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:openstack_control_address}
-    keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:openstack_control_address}
-    heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:openstack_control_address}
-    heat_domain_admin_password: opnfv_secret
-    cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:openstack_control_address}
-    ceilometer_version: ${_param:openstack_version}
-    ceilometer_service_host: ${_param:openstack_telemetry_address}
-    ceilometer_influxdb_password: opnfv_secret
-    nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:openstack_control_address}
-    neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:openstack_control_address}
-    glusterfs_service_host: ${_param:infra_kvm_address}
-    mysql_admin_user: root
-    mysql_admin_password: opnfv_secret
-    mysql_cinder_password: opnfv_secret
-    mysql_ceilometer_password: opnfv_secret
-    mysql_glance_password: opnfv_secret
-    mysql_grafana_password: opnfv_secret
-    mysql_heat_password: opnfv_secret
-    mysql_keystone_password: opnfv_secret
-    mysql_neutron_password: opnfv_secret
-    mysql_nova_password: opnfv_secret
-    mysql_aodh_password: opnfv_secret
-    mysql_designate_password: opnfv_secret
-    aodh_version: ${_param:openstack_version}
-    keystone_aodh_password: opnfv_secret
-    keystone_service_token: opnfv_secret
-    keystone_admin_password: opnfv_secret
-    keystone_ceilometer_password: opnfv_secret
-    keystone_cinder_password: opnfv_secret
-    keystone_glance_password: opnfv_secret
-    keystone_heat_password: opnfv_secret
-    keystone_keystone_password: opnfv_secret
-    keystone_neutron_password: opnfv_secret
-    keystone_nova_password: opnfv_secret
-    keystone_designate_password: opnfv_secret
-    ceilometer_secret_key: opnfv_secret
-    horizon_version: ${_param:openstack_version}
-    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
-    horizon_identity_host: ${_param:openstack_control_address}
-    horizon_identity_encryption: none
-    horizon_identity_version: 2
-    mongodb_server_replica_set: ceilometer
-    mongodb_ceilometer_password: opnfv_secret
-    mongodb_admin_password: opnfv_secret
-    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
-    metadata_password: opnfv_secret
-    openstack_telemetry_keepalived_password: opnfv_secret
-    aodh_service_host: ${_param:openstack_telemetry_address}
-    designate_service_host: ${_param:openstack_control_address}
-    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
-    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
-    designate_pool_ns_records:
-      - hostname: 'ns1.example.org.'
-        priority: 10
-    designate_pool_nameservers:
-      - host: ${_param:openstack_control_node01_address}
-        port: 53
-      - host: ${_param:openstack_control_node02_address}
-        port: 53
-      - host: ${_param:openstack_control_node03_address}
-        port: 53
-    designate_pool_target_type: bind9
-    designate_pool_target_masters:
-      - host: ${_param:openstack_control_node01_address}
-        port: 5354
-      - host: ${_param:openstack_control_node02_address}
-        port: 5354
-      - host: ${_param:openstack_control_node03_address}
-        port: 5354
-    designate_pool_target_options:
-      host: ${_param:openstack_control_node01_address}
-      port: 53
-      rndc_host: ${_param:openstack_control_node01_address}
-      rndc_port: 953
-      rndc_key_file: /etc/designate/rndc.key
-    designate_version: ${_param:openstack_version}
-    # Billing
-    # keystone_billometer_password: opnfv_secret
-    # keystone_billometer_address: ${_param:billometer_service_host}
-    # billometer_service_host: ${_param:openstack_billing_address}
-    # billometer_version: ${_param:openstack_version}
-    # billometer_secret_key: opnfv_secretpasswordpasswordpassword
-    # billometer_identity_password: ${_param:keystone_billometer_password}
-    # billometer_identity_host: ${_param:openstack_control_address}
-    # billometer_identity_token: ${_param:keystone_service_token}
   linux:
     system:
       repo:
@@ -213,121 +30,6 @@ parameters:
           net.ipv4.tcp_fin_timeout: 30
     network:
       host:
-        prx:
-          address: ${_param:openstack_proxy_address}
-          names:
-            - ${_param:openstack_proxy_hostname}
-            - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
-        prx01:
-          address: ${_param:openstack_proxy_node01_address}
-          names:
-            - ${_param:openstack_proxy_node01_hostname}
-            - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
-        prx02:
-          address: ${_param:openstack_proxy_node02_address}
-          names:
-            - ${_param:openstack_proxy_node02_hostname}
-            - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
-        ctl:
-          address: ${_param:openstack_control_address}
-          names:
-            - ${_param:openstack_control_hostname}
-            - ${_param:openstack_control_hostname}.${_param:cluster_domain}
-        ctl01:
-          address: ${_param:openstack_control_node01_address}
-          names:
-            - ${_param:openstack_control_node01_hostname}
-            - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
-        ctl02:
-          address: ${_param:openstack_control_node02_address}
-          names:
-            - ${_param:openstack_control_node02_hostname}
-            - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
-        ctl03:
-          address: ${_param:openstack_control_node03_address}
-          names:
-            - ${_param:openstack_control_node03_hostname}
-            - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
-        msg:
-          address: ${_param:openstack_message_queue_address}
-          names:
-            - ${_param:openstack_message_queue_hostname}
-            - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
-        msg01:
-          address: ${_param:openstack_message_queue_node01_address}
-          names:
-            - ${_param:openstack_message_queue_node01_hostname}
-            - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
-        msg02:
-          address: ${_param:openstack_message_queue_node02_address}
-          names:
-            - ${_param:openstack_message_queue_node02_hostname}
-            - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
-        msg03:
-          address: ${_param:openstack_message_queue_node03_address}
-          names:
-            - ${_param:openstack_message_queue_node03_hostname}
-            - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
-        dbs:
-          address: ${_param:openstack_database_address}
-          names:
-            - ${_param:openstack_database_hostname}
-            - ${_param:openstack_database_hostname}.${_param:cluster_domain}
-        dbs01:
-          address: ${_param:openstack_database_node01_address}
-          names:
-            - ${_param:openstack_database_node01_hostname}
-            - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
-        dbs02:
-          address: ${_param:openstack_database_node02_address}
-          names:
-            - ${_param:openstack_database_node02_hostname}
-            - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
-        dbs03:
-          address: ${_param:openstack_database_node03_address}
-          names:
-            - ${_param:openstack_database_node03_hostname}
-            - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
-        mdb:
-          address: ${_param:openstack_telemetry_address}
-          names:
-            - ${_param:openstack_telemetry_hostname}
-            - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
-        mdb01:
-          address: ${_param:openstack_telemetry_node01_address}
-          names:
-            - ${_param:openstack_telemetry_node01_hostname}
-            - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
-        mdb02:
-          address: ${_param:openstack_telemetry_node02_address}
-          names:
-            - ${_param:openstack_telemetry_node02_hostname}
-            - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
-        mdb03:
-          address: ${_param:openstack_telemetry_node03_address}
-          names:
-            - ${_param:openstack_telemetry_node03_hostname}
-            - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
-        cmp001:
-          address: ${_param:openstack_compute_node01_control_address}
-          names:
-            - ${_param:openstack_compute_node01_hostname}
-            - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
-        cmp002:
-          address: ${_param:openstack_compute_node02_control_address}
-          names:
-            - ${_param:openstack_compute_node02_hostname}
-            - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
-        # gtw01:
-        #   address: ${_param:openstack_gateway_node01_address}
-        #   names:
-        #   - ${_param:openstack_gateway_node01_hostname}
-        #   - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
-        # gtw02:
-        #   address: ${_param:openstack_gateway_node02_address}
-        #   names:
-        #   - ${_param:openstack_gateway_node02_hostname}
-        #   - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}
         odl01:
           address: ${_param:opendaylight_service_host}
           names:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
index f740e2904..afc00a777 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
@@ -1,24 +1,4 @@
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - system.rabbitmq.server.cluster
-  - system.rabbitmq.server.vhost.openstack
   - cluster.baremetal-mcp-ocata-odl-ha
-parameters:
-  _param:
-    keepalived_vip_interface: ${_param:single_nic}
-    keepalived_vip_virtual_router_id: 90
-    cluster_vip_address: ${_param:openstack_message_queue_address}
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: msg01
-    cluster_node01_address: ${_param:openstack_message_queue_node01_address}
-    cluster_node02_hostname: msg02
-    cluster_node02_address: ${_param:openstack_message_queue_node02_address}
-    cluster_node03_hostname: msg03
-    cluster_node03_address: ${_param:openstack_message_queue_node03_address}
-  linux:
-    network:
-      interface:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
+  - cluster.baremetal-mcp-ocata-common.openstack_message_queue
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 83a4be3fb..a5c3a24ae 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -1,45 +1,9 @@
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - system.nginx.server.single
-  - system.nginx.server.proxy.openstack_api
-  - system.nginx.server.proxy.openstack_vnc
-  - system.nginx.server.proxy.openstack_web
-  - system.nginx.server.proxy.openstack.aodh
-  - system.nginx.server.proxy.openstack.ceilometer
-  - system.horizon.server.single
-  - system.salt.minion.cert.proxy
-  - system.sphinx.server.doc.reclass
-  - service.keepalived.cluster.single
   - cluster.baremetal-mcp-ocata-odl-ha.infra
   - cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard
-  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
+  - cluster.baremetal-mcp-ocata-common.openstack_proxy
 parameters:
-  _param:
-    keepalived_vip_interface: ${_param:single_nic}
-    keepalived_vip_virtual_router_id: 240
-    nginx_proxy_ssl:
-      enabled: true
-      authority: ${_param:salt_minion_ca_authority}
-      engine: salt
-      mode: secure
-    cluster_vip_address: ${_param:openstack_proxy_address}
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
-  linux:
-    network:
-      interface:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
-    system:
-      package:
-        libapache2-mod-wsgi:
-  salt:
-    minion:
-      cert:
-        proxy:
-          alternative_names: "IP:${_param:openstack_proxy_address}"
-          key_usage: 'digitalSignature, keyEncipherment'
   nginx:
     server:
       site:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
index 4b14f7beb..de3045357 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
@@ -1,33 +1,4 @@
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - system.mongodb.server.cluster
-  - system.mongodb.server.database.ceilometer
-  - system.ceilometer.server.backend.mongodb
-  # - system.ceilometer.server.backend.influxdb
-  # - system.heka.ceilometer_collector.single
-  - system.ceilometer.server.cluster
-  - system.aodh.server.cluster
   - cluster.baremetal-mcp-ocata-odl-ha.infra
-parameters:
-  _param:
-    keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
-    keepalived_vip_virtual_router_id: 230
-    cluster_vip_address: ${_param:openstack_telemetry_address}
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: mdb01
-    cluster_node01_address: ${_param:openstack_telemetry_node01_address}
-    cluster_node02_hostname: mdb02
-    cluster_node02_address: ${_param:openstack_telemetry_node02_address}
-    cluster_node03_hostname: mdb03
-    cluster_node03_address: ${_param:openstack_telemetry_node03_address}
-  linux:
-    network:
-      interface:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
-  mongodb:
-    server:
-      logging:
-        verbose: v
+  - cluster.baremetal-mcp-ocata-common.openstack_telemetry