X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-ha%2Fopenstack_control.yml.j2;h=edb20e3b6e18a60db0758d222a9082e37c7b7b69;hb=532427ad43e1c1728bf21317aea6af00d9758227;hp=28d727eaa3b784cd36acea6632e78986833b9d45;hpb=ac6d9c6ee11c0ae352608032228ae20f843dd014;p=fuel.git

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 28d727eaa..edb20e3b6 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -8,7 +8,6 @@
 ---
 classes:
   - system.linux.system.repo.mcp.mirror.v1.openstack
-  - system.linux.system.repo.glusterfs
   - system.ceilometer.client
   - system.memcached.server.single
   - system.keystone.server.cluster
@@ -23,6 +22,7 @@ classes:
   - system.barbican.server.cluster
   - system.apache.server.site.barbican
   - service.barbican.server.plugin.simple_crypto
+  - system.apache.server.single
   - system.bind.server.single
   - system.haproxy.proxy.listen.openstack.placement
   - system.glusterfs.client.cluster
@@ -44,9 +44,10 @@ classes:
   # - system.salt.control.cluster.stacklight_server_cluster
   # - system.salt.control.cluster.stacklight_log_cluster
   # - system.salt.control.cluster.stacklight_telemetry_cluster
+  - cluster.mcp-common-ha.glusterfs_repo
   - cluster.mcp-common-ha.infra.kvm_pdf
-  - cluster.mcp-common-ha.include.maas_proxy
-  - cluster.mcp-common-ha.include.lab_proxy_pdf
+  - cluster.all-mcp-arch-common.opnfv.maas_proxy
+  - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
 {%- endif %}
 parameters:
   _param:
@@ -69,7 +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:
@@ -89,10 +92,12 @@ parameters:
       <<: *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:
@@ -125,7 +130,7 @@ parameters:
   apache:
     server:
       bind:
-        ~ports: ~
+        listen_default_ports: false
   # sync from common-ha kvm role
   glusterfs:
     server:
@@ -151,9 +156,6 @@ parameters:
       listen:
         heat_cloudwatch_api:
           enabled: false
-        neutron_api:
-          # Set source balancing
-          type: heat
   barbican:
     server:
       ks_notifications_enable: true
@@ -180,6 +182,9 @@ parameters:
           keys:
             - designate
   designate:
+    _support:
+      sphinx:
+        enabled: False  # Workaround broken meta/sphinx.yml in salt-formula-designate
     server:
       pools:
         default: