aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-11-23 17:17:59 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-12-19 17:05:47 +0400
commita31343155a621469f6e803b23dc6cc8bbb545dfa (patch)
treec6d641c926164d4397b1925c3dcf28c8738935f8 /mcp/reclass
parent59163643073370c58a201b45c0e1dd5556e2b0f6 (diff)
Update OpenStack version to Rocky
Change-Id: I88f28370180278c4b32599b83eebbb0ee005c936 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j29
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j29
9 files changed, 10 insertions, 23 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
index dfa1d89cc..b0ca10205 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
@@ -12,7 +12,7 @@ classes:
- cluster.all-mcp-arch-common.passwords
parameters:
_param:
- openstack_version: queens
+ openstack_version: rocky
apt_mk_version: nightly
mcp_repo_version: 1.1
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
index 6b344efac..349d4f1c8 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
@@ -8,6 +8,7 @@
{%- import 'net_map.j2' as nm with context %}
---
classes:
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- service.keepalived.cluster.single
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
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 41625e8ff..0770f5c45 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
@@ -28,6 +28,7 @@ classes:
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
- system.glusterfs.client.volume.keystone
+ - cluster.mcp-common-ha.glusterfs_repo
{%- if not conf.MCP_VCP %}
# sync from kvm
- service.keepalived.cluster.single
@@ -44,7 +45,6 @@ classes:
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
- - cluster.mcp-common-ha.glusterfs_repo
- cluster.mcp-common-ha.infra.kvm_pdf
- cluster.all-mcp-arch-common.opnfv.maas_proxy
- cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
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 bb76fdb10..b3c51f2e3 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
@@ -7,8 +7,6 @@
##############################################################################
{%- import 'net_map.j2' as nm with context %}
---
-classes:
- - cluster.all-mcp-arch-common.uca_repo
parameters:
_param:
# openstack service addresses
@@ -197,13 +195,8 @@ parameters:
# billometer_identity_token: ${_param:keystone_service_token}
linux:
system:
- repo:
- uca:
- pin:
- - pin: 'release o=Canonical'
- priority: 1200
- package: 'libvirt* qemu* 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}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
index fad9052cc..7f2f269a7 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
@@ -49,7 +49,7 @@ parameters:
kernel/mm/transparent_hugepage/enabled: never
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_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}