[mcp] Replace reclass system models with submodule

Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

24 files changed, 0 insertions, 707 deletions

diff --git a/mcp/reclass/classes/system/keystone/client/service/aodh.yml b/mcp/reclass/classes/system/keystone/client/service/aodh.yml
deleted file mode 100644
index 51de0ca89..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/aodh.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                aodh:
-                  is_admin: true
-                  password: ${_param:keystone_aodh_password}
-                  email: ${_param:admin_email}
-          service:
-            aodh:
-              type: alarming
-              description: OpenStack Alarming Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8042
-                public_path: '/'
-                internal_address: ${_param:aodh_service_host}
-                internal_port: 8042
-                internal_path: '/'
-                admin_address: ${_param:aodh_service_host}
-                admin_port: 8042
-                admin_path: '/'
diff --git a/mcp/reclass/classes/system/keystone/client/service/billometer.yml b/mcp/reclass/classes/system/keystone/client/service/billometer.yml
deleted file mode 100644
index 3728aa54c..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/billometer.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                billometer:
-                  is_admin: true
-                  password: ${_param:keystone_billometer_password}
-                  email: ${_param:admin_email}
-          service:
-            billometer:
-              type: billing
-              description: OpenStack Billing Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 9753
-                public_path: '/v1'
-                internal_address: ${_param:billometer_service_host}
-                internal_port: 9753
-                internal_path: '/v1'
-                admin_address: ${_param:billometer_service_host}
-                admin_port: 9753
-                admin_path: '/v1'
diff --git a/mcp/reclass/classes/system/keystone/client/service/ceilometer.yml b/mcp/reclass/classes/system/keystone/client/service/ceilometer.yml
deleted file mode 100644
index 4c59f80f3..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/ceilometer.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                ceilometer:
-                  is_admin: true
-                  password: ${_param:keystone_ceilometer_password}
-                  email: ${_param:admin_email}
-          service:
-            ceilometer:
-              type: metering
-              description: OpenStack Telemetry Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8777
-                public_path: '/'
-                internal_address: ${_param:ceilometer_service_host}
-                internal_port: 8777
-                internal_path: '/'
-                admin_address: ${_param:ceilometer_service_host}
-                admin_port: 8777
-                admin_path: '/'
diff --git a/mcp/reclass/classes/system/keystone/client/service/cinder.yml b/mcp/reclass/classes/system/keystone/client/service/cinder.yml
deleted file mode 100644
index ffb55102a..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/cinder.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                cinder:
-                  is_admin: true
-                  password: ${_param:keystone_cinder_password}
-                  email: ${_param:admin_email}
-          service:
-            cinder:
-              type: volume
-              description: OpenStack Volume Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8776
-                public_path: '/v1/$(project_id)s'
-                internal_address: ${_param:cinder_service_host}
-                internal_port: 8776
-                internal_path: '/v1/$(project_id)s'
-                admin_address: ${_param:cinder_service_host}
-                admin_port: 8776
-                admin_path: '/v1/$(project_id)s'
diff --git a/mcp/reclass/classes/system/keystone/client/service/cinder2.yml b/mcp/reclass/classes/system/keystone/client/service/cinder2.yml
deleted file mode 100644
index e0e2636c5..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/cinder2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                cinder:
-                  is_admin: true
-                  password: ${_param:keystone_cinder_password}
-                  email: ${_param:admin_email}
-          service:
-            cinderv2:
-              type: volumev2
-              description: OpenStack Volume Service v2
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8776
-                public_path: '/v2/$(project_id)s'
-                internal_address: ${_param:cinder_service_host}
-                internal_port: 8776
-                internal_path: '/v2/$(project_id)s'
-                admin_address: ${_param:cinder_service_host}
-                admin_port: 8776
-                admin_path: '/v2/$(project_id)s'
diff --git a/mcp/reclass/classes/system/keystone/client/service/cinder3.yml b/mcp/reclass/classes/system/keystone/client/service/cinder3.yml
deleted file mode 100644
index 43a805cf3..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/cinder3.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                cinder:
-                  is_admin: true
-                  password: ${_param:keystone_cinder_password}
-                  email: ${_param:admin_email}
-          service:
-            cinderv3:
-              type: volumev3
-              description: OpenStack Volume Service v3
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8776
-                public_path: '/v3/$(project_id)s'
-                internal_address: ${_param:cinder_service_host}
-                internal_port: 8776
-                internal_path: '/v3/$(project_id)s'
-                admin_address: ${_param:cinder_service_host}
-                admin_port: 8776
-                admin_path: '/v3/$(project_id)s'
-
diff --git a/mcp/reclass/classes/system/keystone/client/service/designate.yml b/mcp/reclass/classes/system/keystone/client/service/designate.yml
deleted file mode 100644
index 4018712c7..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/designate.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                designate:
-                  is_admin: true
-                  password: ${_param:keystone_designate_password}
-                  email: ${_param:admin_email}
-          service:
-            designate:
-                type: dns
-                description: OpenStack DNS service
-                endpoints:
-                  - region: ${_param:openstack_region}
-                    public_address: ${_param:cluster_public_host}
-                    public_protocol: ${_param:cluster_public_protocol}
-                    public_port: 9001
-                    public_path: '/'
-                    internal_address: ${_param:designate_service_host}
-                    internal_port: 9001
-                    internal_path: '/'
-                    admin_address: ${_param:designate_service_host}
-                    admin_port: 9001
-                    admin_path: '/'
diff --git a/mcp/reclass/classes/system/keystone/client/service/glance.yml b/mcp/reclass/classes/system/keystone/client/service/glance.yml
deleted file mode 100644
index 365917b9f..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/glance.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                glance:
-                  is_admin: true
-                  password: ${_param:keystone_glance_password}
-                  email: ${_param:admin_email}
-          service:
-            glance:
-              type: image
-              description: OpenStack Image Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 9292
-                public_path: ''
-                internal_address: ${_param:glance_service_host}
-                internal_port: 9292
-                internal_path: ''
-                admin_address: ${_param:glance_service_host}
-                admin_port: 9292
-                admin_path: ''
diff --git a/mcp/reclass/classes/system/keystone/client/service/glare.yml b/mcp/reclass/classes/system/keystone/client/service/glare.yml
deleted file mode 100644
index 78c7d1f8d..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/glare.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                glance:
-                  is_admin: true
-                  password: ${_param:keystone_glance_password}
-                  email: ${_param:admin_email}
-          service:
-            glare:
-              type: artifact
-              description: OpenStack Image Artifact Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 9494
-                public_path: ''
-                internal_address: ${_param:glance_service_host}
-                internal_port: 9494
-                internal_path: ''
-                admin_address: ${_param:glance_service_host}
-                admin_port: 9494
-                admin_path: ''
-
diff --git a/mcp/reclass/classes/system/keystone/client/service/heat-cfn.yml b/mcp/reclass/classes/system/keystone/client/service/heat-cfn.yml
deleted file mode 100644
index 343ff461d..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/heat-cfn.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          service:
-            heat-cfn:
-              type: cloudformation
-              description: OpenStack CloudFormation Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8000
-                public_path: '/v1'
-                internal_address: ${_param:heat_service_host}
-                internal_port: 8000
-                internal_path: '/v1'
-                admin_address: ${_param:heat_service_host}
-                admin_port: 8000
-                admin_path: '/v1'
diff --git a/mcp/reclass/classes/system/keystone/client/service/heat.yml b/mcp/reclass/classes/system/keystone/client/service/heat.yml
deleted file mode 100644
index d7eadd543..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/heat.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          roles:
-          - heat_stack_user
-          - heat_stack_owner
-          project:
-            service:
-              user:
-                heat:
-                  is_admin: true
-                  password: ${_param:keystone_heat_password}
-                  email: ${_param:admin_email}
-          service:
-            heat:
-              type: orchestration
-              description: OpenStack Orchestration Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8004
-                public_path: '/v1/%(project_id)s'
-                internal_address: ${_param:heat_service_host}
-                internal_port: 8004
-                internal_path: '/v1/%(project_id)s'
-                admin_address: ${_param:heat_service_host}
-                admin_port: 8004
-                admin_path: '/v1/%(project_id)s'
diff --git a/mcp/reclass/classes/system/keystone/client/service/keystone.yml b/mcp/reclass/classes/system/keystone/client/service/keystone.yml
deleted file mode 100644
index af3acfca2..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/keystone.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          service:
-            keystone:
-              type: identity
-              description: OpenStack Identity Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 5000
-                public_path: '/v2.0'
-                internal_address: ${_param:keystone_service_host}
-                internal_port: 5000
-                internal_path: '/v2.0'
-                admin_address: ${_param:keystone_service_host}
-                admin_port: 35357
-                admin_path: '/v2.0'
diff --git a/mcp/reclass/classes/system/keystone/client/service/keystone3.yml b/mcp/reclass/classes/system/keystone/client/service/keystone3.yml
deleted file mode 100644
index 9dd9eef6e..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/keystone3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          service:
-            keystone3:
-              type: identity
-              description: OpenStack Identity Service v3
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 5000
-                public_path: '/v3'
-                internal_address: ${_param:keystone_service_host}
-                internal_port: 5000
-                internal_path: '/v3'
-                admin_address: ${_param:keystone_service_host}
-                admin_port: 35357
-                admin_path: '/v3'
diff --git a/mcp/reclass/classes/system/keystone/client/service/murano.yml b/mcp/reclass/classes/system/keystone/client/service/murano.yml
deleted file mode 100644
index 5e6503885..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/murano.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                murano:
-                  is_admin: true
-                  password: ${_param:keystone_murano_password}
-                  email: ${_param:admin_email}
-          service:
-            murano:
-              type: application-catalog
-              description: Application Catalog for OpenStack
-              endpoints:
-                - region: ${_param:openstack_region}
-                  public_address: ${_param:cluster_public_host}
-                  public_protocol: ${_param:cluster_public_protocol}
-                  public_port: 8082
-                  public_path: ''
-                  internal_address: ${_param:murano_service_host}
-                  internal_port: 8082
-                  internal_path: ''
-                  admin_address: ${_param:murano_service_host}
-                  admin_port: 8082
-                  admin_path: ''
diff --git a/mcp/reclass/classes/system/keystone/client/service/neutron.yml b/mcp/reclass/classes/system/keystone/client/service/neutron.yml
deleted file mode 100644
index 12fe9fe17..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/neutron.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                neutron:
-                  is_admin: true
-                  password: ${_param:keystone_neutron_password}
-                  email: ${_param:admin_email}
-          service:
-            neutron:
-              type: network
-              description: OpenStack Networking Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 9696
-                public_path: '/'
-                internal_address: ${_param:neutron_service_host}
-                internal_port: 9696
-                internal_path: '/'
-                admin_address: ${_param:neutron_service_host}
-                admin_port: 9696
-                admin_path: '/'
diff --git a/mcp/reclass/classes/system/keystone/client/service/nova-ec2.yml b/mcp/reclass/classes/system/keystone/client/service/nova-ec2.yml
deleted file mode 100644
index 586701cb0..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/nova-ec2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          service:
-            nova-ec2:
-              type: ec2
-              description: OpenStack EC2 Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8773
-                public_path: '/services/Cloud'
-                internal_address: ${_param:nova_service_host}
-                internal_port: 8773
-                internal_path: '/services/Cloud'
-                admin_address: ${_param:nova_service_host}
-                admin_port: 8773
-                admin_path: '/services/Admin'
diff --git a/mcp/reclass/classes/system/keystone/client/service/nova-placement.yml b/mcp/reclass/classes/system/keystone/client/service/nova-placement.yml
deleted file mode 100644
index 61b54550d..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/nova-placement.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          service:
-            placement:
-              type: placement
-              description: OpenStack Placement API
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: '8778'
-                public_path: ''
-                internal_address: ${_param:nova_service_host}
-                internal_port: '8778'
-                internal_path: ''
-                admin_address: ${_param:nova_service_host}
-                admin_port: '8778'
-                admin_path: ''
diff --git a/mcp/reclass/classes/system/keystone/client/service/nova.yml b/mcp/reclass/classes/system/keystone/client/service/nova.yml
deleted file mode 100644
index a0d698ba7..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/nova.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                nova:
-                  is_admin: true
-                  password: ${_param:keystone_nova_password}
-                  email: ${_param:admin_email}
-          service:
-            nova:
-              type: compute
-              description: OpenStack Compute Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8774
-                public_path: '/v2/$(project_id)s'
-                internal_address: ${_param:nova_service_host}
-                internal_port: 8774
-                internal_path: '/v2/$(project_id)s'
-                admin_address: ${_param:nova_service_host}
-                admin_port: 8774
-                admin_path: '/v2/$(project_id)s'
diff --git a/mcp/reclass/classes/system/keystone/client/service/nova21.yml b/mcp/reclass/classes/system/keystone/client/service/nova21.yml
deleted file mode 100644
index 328aefd7c..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/nova21.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                nova:
-                  is_admin: true
-                  password: ${_param:keystone_nova_password}
-                  email: ${_param:admin_email}
-          service:
-            nova20:
-              type: compute_legacy
-              description: OpenStack Compute Service
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8774
-                public_path: '/v2/$(project_id)s'
-                internal_address: ${_param:nova_service_host}
-                internal_port: 8774
-                internal_path: '/v2/$(project_id)s'
-                admin_address: ${_param:nova_service_host}
-                admin_port: 8774
-                admin_path: '/v2/$(project_id)s'
-            nova:
-              type: compute
-              description: OpenStack Compute Service v2.1
-              endpoints:
-              - region: ${_param:openstack_region}
-                public_address: ${_param:cluster_public_host}
-                public_protocol: ${_param:cluster_public_protocol}
-                public_port: 8774
-                public_path: '/v2.1/$(project_id)s'
-                internal_address: ${_param:nova_service_host}
-                internal_port: 8774
-                internal_path: '/v2.1/$(project_id)s'
-                admin_address: ${_param:nova_service_host}
-                admin_port: 8774
-                admin_path: '/v2.1/$(project_id)s'
diff --git a/mcp/reclass/classes/system/keystone/client/service/radosgw-s3.yml b/mcp/reclass/classes/system/keystone/client/service/radosgw-s3.yml
deleted file mode 100644
index 06d82991b..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/radosgw-s3.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-    radosgw_s3_cluster_port: 8081
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                swift:
-                  is_admin: true
-                  password: ${_param:keystone_swift_password}
-                  email: ${_param:admin_email}
-          service:
-            radosgw-s3:
-              type: s3
-              description: S3 Service (radosgw)
-              endpoints:
-                - region: ${_param:openstack_region}
-                  public_address: ${_param:cluster_public_host}
-                  public_protocol: ${_param:cluster_public_protocol}
-                  public_port: ${_param:radosgw_s3_cluster_port}
-                  public_path: '/' # /$(project_id)s
-                  internal_address: ${_param:radosgw_service_host}
-                  internal_port: ${_param:radosgw_s3_cluster_port}
-                  internal_path: '/'
-                  admin_address: ${_param:radosgw_service_host}
-                  admin_port: ${_param:radosgw_s3_cluster_port}
-                  admin_path: '/'
diff --git a/mcp/reclass/classes/system/keystone/client/service/radosgw-swift.yml b/mcp/reclass/classes/system/keystone/client/service/radosgw-swift.yml
deleted file mode 100644
index 9c7547e54..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/radosgw-swift.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                swift:
-                  is_admin: true
-                  password: ${_param:keystone_swift_password}
-                  email: ${_param:admin_email}
-          service:
-            radosgw-swift:
-              type: object-store
-              description: Swift Service (radosgw)
-              endpoints:
-                - region: ${_param:openstack_region}
-                  public_address: ${_param:cluster_public_host}
-                  public_protocol: ${_param:cluster_public_protocol}
-                  public_port: 8081
-                  public_path: '/swift/v1' # /$(project_id)s
-                  internal_address: ${_param:radosgw_service_host}
-                  internal_port: 8081
-                  internal_path: '/swift/v1'
-                  admin_address: ${_param:radosgw_service_host}
-                  admin_port: 8081
-                  admin_path: '/swift/v1'
diff --git a/mcp/reclass/classes/system/keystone/client/service/sahara.yml b/mcp/reclass/classes/system/keystone/client/service/sahara.yml
deleted file mode 100644
index 84a0b9621..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/sahara.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                sahara:
-                  is_admin: true
-                  password: ${_param:keystone_sahara_password}
-                  email: ${_param:admin_email}
-          service:
-            sahara:
-              type: data-processing
-              description: Sahara Data Processing
-              endpoints:
-                - region: ${_param:openstack_region}
-                  public_address: ${_param:cluster_public_host}
-                  public_protocol: ${_param:cluster_public_protocol}
-                  public_port: 8386
-                  public_path: '/v1.1/%(project_id)s'
-                  internal_address: ${_param:sahara_service_host}
-                  internal_port: 8386
-                  internal_path: '/v1.1/%(project_id)s'
-                  admin_address: ${_param:sahara_service_host}
-                  admin_port: 8386
-                  admin_path: '/v1.1/%(project_id)s'
diff --git a/mcp/reclass/classes/system/keystone/client/service/swift-s3.yml b/mcp/reclass/classes/system/keystone/client/service/swift-s3.yml
deleted file mode 100644
index 5880487c9..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/swift-s3.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                swift:
-                  is_admin: true
-                  password: ${_param:keystone_swift_password}
-                  email: ${_param:admin_email}
-          service:
-            swift-s3:
-              type: object-store
-              description: S3 Service (swift)
-              region: ${_param:openstack_region}
-              endpoints:
-                - region: ${_param:openstack_region}
-                  public_address: ${_param:cluster_public_host}
-                  public_protocol: ${_param:cluster_public_protocol}
-                  public_port: 8080
-                  public_path: '/v1/AUTH_%(project_id)s'
-                  internal_address: ${_param:swift_service_host}
-                  internal_port: 8080
-                  internal_path: '/v1/AUTH_%(project_id)s'
-                  admin_address: ${_param:swift_service_host}
-                  admin_port: 8080
-                  admin_path: '/'
diff --git a/mcp/reclass/classes/system/keystone/client/service/swift.yml b/mcp/reclass/classes/system/keystone/client/service/swift.yml
deleted file mode 100644
index 781fab9c6..000000000
--- a/mcp/reclass/classes/system/keystone/client/service/swift.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    cluster_public_protocol: https
-  keystone:
-    client:
-      server:
-        identity:
-          project:
-            service:
-              user:
-                swift:
-                  is_admin: true
-                  password: ${_param:keystone_swift_password}
-                  email: ${_param:admin_email}
-          service:
-            swift:
-              type: object-store
-              description: Swift Service
-              endpoints:
-                - region: ${_param:openstack_region}
-                  public_address: ${_param:cluster_public_host}
-                  public_protocol: ${_param:cluster_public_protocol}
-                  public_port: 8080
-                  public_path: '/v1/AUTH_%(project_id)s'
-                  internal_address: ${_param:swift_service_host}
-                  internal_port: 8080
-                  internal_path: '/v1/AUTH_%(project_id)s'
-                  admin_address: ${_param:swift_service_host}
-                  admin_port: 8080
-                  admin_path: '/'