diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 index 54df34cc6..3f3ff0ab8 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 @@ -7,8 +7,6 @@ ############################################################################## {%- import 'net_map.j2' as nm with context %} --- -classes: - - cluster.all-mcp-arch-common.uca_repo parameters: _param: openstack_region: RegionOne @@ -56,6 +54,12 @@ parameters: horizon_identity_host: ${_param:cluster_vip_address} horizon_identity_encryption: none horizon_identity_version: 3 + horizon_public_protocol: http + horizon_public_port: 80 + apache_mods_status_enabled: false + nginx_server_site_nginx_proxy_openstack_web_enabled: true + nginx_proxy_ssl: + enabled: false barbican_version: ${_param:openstack_version} barbican_service_host: ${_param:cluster_local_address} @@ -69,7 +73,7 @@ parameters: aodh_version: ${_param:openstack_version} aodh_service_host: ${_param:cluster_local_address} - gnocchi_version: 4.2 + gnocchi_version: 4.3 gnocchi_service_host: ${_param:cluster_local_address} panko_version: ${_param:openstack_version} panko_service_host: ${_param:cluster_local_address} @@ -83,20 +87,22 @@ parameters: net.ipv4.tcp_congestion_control: yeah net.ipv4.tcp_slow_start_after_idle: 0 net.ipv4.tcp_fin_timeout: 30 - repo: - uca: - pin: - - pin: 'release o=Canonical' - priority: 1200 - package: 'openvswitch* python-openvswitch ovn* dpdk* libdpdk*' {%- if 'aarch64' in nm.cluster.arch %} + repo: armband_3: # Should be in sync with the repo config generated via curtin/MaaS - source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main" + source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial ${_param:armband_repo_version}-armband main" key: ${_param:armband_key} - pin: - - pin: 'release a=${_param:openstack_version}-armband' - priority: 1201 + pinning: + 15: + enabled: true + pin: 'release a=${_param:armband_repo_version}-armband' + priority: 15 package: '*' + 1200: + enabled: true + pin: 'release a=${_param:armband_repo_version}-armband' + priority: 1200 + package: 'qemu-efi' {%- endif %} network: host: |