Update system reclass

[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 2891664..9f39d03 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,7 @@
 ---
 classes:
   - system.linux.system.lowmem
-  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.nfs.server
   - system.ceilometer.client
   - system.ceilometer.client.neutron
@@ -22,7 +22,6 @@ classes:
   - system.keystone.client.service.nova21
   - system.keystone.client.service.nova-placement
   - system.keystone.client.service.cinder3
-  - system.keystone.client.service.ceilometer
   - system.keystone.client.service.aodh
   - system.keystone.client.service.gnocchi
   - system.keystone.client.service.panko
@@ -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
@@ -72,7 +70,6 @@ classes:
   - cluster.mcp-common-noha.openstack_control_pdf
 parameters:
   _param:
-    interface_mtu: 9000
     linux_system_codename: xenial
     ceilometer_create_gnocchi_resources: 'True'
     barbican_integration_enabled: 'false'
@@ -185,9 +182,10 @@ parameters:
     server:
       vlan_aware_vms: true
       root_helper_daemon: false
-      global_physnet_mtu: 9000
+      agent_down_time: 300
+      global_physnet_mtu: ${_param:interface_mtu}
       backend:
-        external_mtu: 9000
+        external_mtu: ${_param:interface_mtu}
 {%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %}
       bgp_vpn:
         enabled: True