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=0189e038ce16119957297d1e691e395d8f909bd5;hb=b03bc918a67f86d6a89441739f4a2952993c9e67;hp=cdebe3fb3f90b1048029a56533b06c638c66245f;hpb=327cf3fb6a1c5745fa9666d4e2762ee1e4eac853;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 cdebe3fb3..0189e038c 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
@@ -21,7 +21,7 @@ classes:
   - system.designate.server.cluster
   - system.designate.server.backend.bind
   - system.bind.server.single
-  - system.haproxy.proxy.listen.openstack.nova-placement
+  - system.haproxy.proxy.listen.openstack.placement
   - system.glusterfs.client.cluster
   - system.glusterfs.client.volume.glance
   - system.glusterfs.client.volume.keystone
@@ -67,9 +67,31 @@ parameters:
     cluster_node03_address: ${_param:openstack_control_node03_address}
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
     glusterfs_version: '3.13'
+  nova:
+    controller: &db_conn_recycle_time
+      database:
+        connection_recycle_time: ${_param:db_connection_recycle_time}
+  cinder:
+    controller:
+      <<: *db_conn_recycle_time
+  neutron:
+    server:
+      <<: *db_conn_recycle_time
+      vlan_aware_vms: true
+      root_helper_daemon: false
+  keystone:
+    server:
+      <<: *db_conn_recycle_time
+      cacert: /etc/ssl/certs/mcp_os_cacert
+      openrc_extra:
+        volume_device_name: vdc
+  glance:
+    server:
+      <<: *db_conn_recycle_time
 {%- if conf.MCP_VCP %}
   heat:
     server:
+      <<: *db_conn_recycle_time
       metadata:
         host: ${_param:openstack_proxy_control_address}
         port: 8000
@@ -99,9 +121,6 @@ parameters:
     server:
       bind:
         ~ports: ~
-      ~modules:
-        - rewrite
-        - wsgi
   # sync from common-ha kvm role
   glusterfs:
     server:
@@ -122,25 +141,14 @@ parameters:
             diagnostics.client-log-level: WARNING
             diagnostics.brick-log-level: WARNING
 {%- endif %}
-  neutron:
-    server:
-      vlan_aware_vms: true
-      root_helper_daemon: false
-  keystone:
-    server:
-      cacert: /etc/ssl/certs/mcp_os_cacert
-      openrc_extra:
-        volume_device_name: vdc
   haproxy:
     proxy:
       listen:
-        nova_placement_api:
-          health-check:
-            http:
-              ~options:
-                - expect status 405
-        ~heat_cloudwatch_api:
+        heat_cloudwatch_api:
           enabled: false
+        neutron_api:
+          # Set source balancing
+          type: heat
   bind:
     server:
       control: