Disable block migration explicitly

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / openstack_control.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index 02a9168..019fc0c 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -8,7 +8,6 @@
 ---
 classes:
   - system.linux.system.lowmem
-  - system.linux.system.repo.mcp.openstack
   - service.nfs.server
   - system.ceilometer.client
   - system.ceilometer.client.neutron
@@ -35,11 +34,10 @@ classes:
   - service.mysql.server.single
   - system.galera.server.database.cinder
   - system.galera.server.database.glance
-  - system.galera.server.database.grafana
+  - system.galera.server.database.neutron
   - system.galera.server.database.heat
   - system.galera.server.database.keystone
   - system.galera.server.database.nova
-  - system.galera.server.database.ceilometer
   - system.galera.server.database.aodh
   - system.galera.server.database.gnocchi
   - system.galera.server.database.panko
@@ -48,14 +46,9 @@ classes:
   - service.barbican.server.plugin.simple_crypto
   - service.redis.server.single
   - service.ceilometer.server.single
-  - system.ceilometer.server.coordination.redis
   - system.ceilometer.server.backend.default
   - system.aodh.server.single
-  - system.aodh.server.coordination.redis
   - system.gnocchi.server.single
-  - system.gnocchi.common.storage.incoming.redis
-  - system.gnocchi.common.storage.redis
-  - system.gnocchi.common.coordination.redis
   - service.panko.server.single
   - system.apache.server.site.gnocchi
   - system.apache.server.site.panko
@@ -68,12 +61,14 @@ classes:
   - system.galera.server.database.tacker
   - service.tacker.server.single
 {%- endif %}
+  - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-noha.haproxy_openstack_api
   - cluster.mcp-common-noha.openstack_control_pdf
 parameters:
   _param:
     linux_system_codename: xenial
     ceilometer_create_gnocchi_resources: 'True'
+    ceilometer_endpoint_status: absent
     barbican_integration_enabled: 'false'
   linux:
     system:
@@ -88,6 +83,7 @@ parameters:
       admin_email: ${_param:admin_email}
       openrc_extra:
         volume_device_name: sdc
+        block_migration: false
       pkgs:
         - keystone
         - python-psycopg2
@@ -99,6 +95,13 @@ parameters:
       resources:
         v3:
           enabled: true
+          services:
+            ceilometer:
+              status: absent
+            # required only for Rally validation
+            cinder:
+              type: volume
+              description: OpenStack Volume Service
       server:
         identity:
           admin:
@@ -164,10 +167,18 @@ parameters:
       ~database: ~
   redis:
     server:
-      version: 3.0
+      version: 5.0
       appendfsync: 'no'
       bind:
         address: ${_param:single_address}
+  gnocchi:
+    common:
+      storage:
+        driver: redis
+        redis_url: redis://${_param:single_address}:6379
+        incoming:
+          driver: redis
+          redis_url: redis://${_param:single_address}:6379
   nfs:
     server:
       share:
@@ -184,6 +195,7 @@ parameters:
     server:
       vlan_aware_vms: true
       root_helper_daemon: false
+      agent_down_time: 300
       global_physnet_mtu: ${_param:interface_mtu}
       backend:
         external_mtu: ${_param:interface_mtu}