Merge "[noha] Adopt vPDF usage"

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

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index 9f05790..d070cf3 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -123,6 +123,7 @@ parameters:
 
     openstack_region: RegionOne
     admin_email: root@localhost
+    db_connection_recycle_time: 300
     # Neutron osv/nodvr
     neutron_control_dvr: 'False'
     neutron_global_physnet_mtu: 1500
@@ -192,7 +193,7 @@ parameters:
     metadata_password: opnfv_secret
     openstack_telemetry_keepalived_password: opnfv_secret
     aodh_service_host: ${_param:openstack_telemetry_address}
-    gnocchi_version: 4.0
+    gnocchi_version: 4.2
     gnocchi_service_host: ${_param:openstack_telemetry_address}
     mysql_gnocchi_password: opnfv_secret
     keystone_gnocchi_password: opnfv_secret
@@ -247,6 +248,10 @@ parameters:
           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
           key_id: EC4926EA
           key_server: keyserver.ubuntu.com
+          pin:
+            - pin: 'release o=Canonical'
+              priority: 1200
+              package: 'python-pymysql libvirt* *qemu*'
       kernel:
         sysctl:
           net.ipv4.tcp_congestion_control: yeah