Update system reclass

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

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 120fc9f..227205e 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -7,8 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
-  - system.linux.system.repo.glusterfs
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - system.ceilometer.client
   - system.memcached.server.single
   - system.keystone.server.cluster
@@ -29,6 +28,7 @@ classes:
   - system.glusterfs.client.cluster
   - system.glusterfs.client.volume.glance
   - system.glusterfs.client.volume.keystone
+  - cluster.mcp-common-ha.glusterfs_repo
 {%- if not conf.MCP_VCP %}
   # sync from kvm
   - service.keepalived.cluster.single
@@ -70,8 +70,9 @@ parameters:
     cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
     cluster_node03_address: ${_param:openstack_control_node03_address}
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-    glusterfs_version: '3.13'
     barbican_integration_enabled: 'false'
+    fernet_rotation_driver: 'shared_filesystem'
+    credential_rotation_driver: 'shared_filesystem'
   nova:
     controller: &db_conn_recycle_time
       database:
@@ -86,15 +87,21 @@ parameters:
       <<: *db_conn_recycle_time
       vlan_aware_vms: true
       root_helper_daemon: false
+      agent_down_time: 300
+      global_physnet_mtu: ${_param:interface_mtu}
+      backend:
+        external_mtu: ${_param:interface_mtu}
   keystone:
     server:
       <<: *db_conn_recycle_time
       cacert: /etc/ssl/certs/mcp_os_cacert
       openrc_extra:
-        volume_device_name: vdc
+        volume_device_name: sdc
   glance:
     server:
       <<: *db_conn_recycle_time
+      identity:
+        barbican_endpoint: ${barbican:server:host_href}
 {%- if conf.MCP_VCP %}
   heat:
     server: