From a31343155a621469f6e803b23dc6cc8bbb545dfa Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 23 Nov 2018 17:17:59 +0400 Subject: Update OpenStack version to Rocky Change-Id: I88f28370180278c4b32599b83eebbb0ee005c936 Signed-off-by: Michael Polenchuk --- .../classes/cluster/mcp-common-noha/openstack_compute.yml | 2 +- .../classes/cluster/mcp-common-noha/openstack_control.yml.j2 | 4 ++-- .../classes/cluster/mcp-common-noha/openstack_gateway.yml | 2 +- .../classes/cluster/mcp-common-noha/openstack_init.yml.j2 | 9 +-------- 4 files changed, 5 insertions(+), 12 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-common-noha') diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml index f3c668f08..41841c922 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -15,7 +15,7 @@ classes: - system.ceilometer.client.nova_compute - system.ceilometer.client.cinder_volume - system.ceilometer.agent.polling.default - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - service.barbican.client.single - cluster.mcp-common-noha.openstack_compute_pdf parameters: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 index 02a9168d0..d36d5830a 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -8,7 +8,7 @@ --- classes: - system.linux.system.lowmem - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - service.nfs.server - system.ceilometer.client - system.ceilometer.client.neutron @@ -164,7 +164,7 @@ parameters: ~database: ~ redis: server: - version: 3.0 + version: 5.0 appendfsync: 'no' bind: address: ${_param:single_address} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml index f29cb867c..499749d82 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - cluster.mcp-common-noha.openstack_gateway_pdf parameters: _param: 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..02b6e9ea5 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 @@ -83,13 +81,8 @@ 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" key: ${_param:armband_key} -- cgit 1.2.3-korg