diff options
Diffstat (limited to 'mcp')
3 files changed, 38 insertions, 10 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index 4a0764fd9..90cbb87bb 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -7,7 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.mirror.v1.openstack - system.linux.system.repo.glusterfs - system.glusterfs.client.cluster - system.nova.compute.cluster @@ -51,6 +50,8 @@ parameters: lvm-driver: # Align system.cinder.volume.backend.lvm and MaaS data volume_group: ${linux:storage:lvm:cinder-vg:name} + database: + connection_recycle_time: ${_param:db_connection_recycle_time} linux: storage: lvm: 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 ceb3622b1..38fe06a89 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 @@ -67,9 +67,37 @@ 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 + aodh: + server: + <<: *db_conn_recycle_time + panko: + server: + <<: *db_conn_recycle_time {%- if conf.MCP_VCP %} heat: server: + <<: *db_conn_recycle_time metadata: host: ${_param:openstack_proxy_control_address} port: 8000 @@ -119,20 +147,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: heat_cloudwatch_api: enabled: false + neutron_api: + # Set source balancing + type: heat bind: server: control: 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 15b93187d..1e641b6bd 100644 --- 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 @@ -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' kernel: sysctl: net.ipv4.tcp_congestion_control: yeah |