summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-04-05 17:24:39 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-04-08 18:24:39 +0400
commita2f5e2800be18071f4867121d71e2ace842354ef (patch)
tree62d7226e48bbd329da897cca050913c84f99ddb8
parentf021e19b4797eb4f6830d86056fce919f1e1fe01 (diff)
Setup repository with backports
Change-Id: I791436f512dea6c6bc61133c4122ac872950af8e Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml2
-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_database.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j22
-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.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j22
12 files changed, 33 insertions, 11 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
new file mode 100644
index 000000000..d6f4fb563
--- /dev/null
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
@@ -0,0 +1,22 @@
+##############################################################################
+# Copyright (c) 2019 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - system.linux.system.repo.mcp.apt_mirantis.openstack
+parameters:
+ _param:
+ backports_version: queens
+ linux:
+ system:
+ repo:
+ mirantis_openstack_backports:
+ # yamllint disable-line rule:line-length
+ source: "deb ${_param:linux_system_repo_url}/openstack-${_param:backports_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mirror_mirantis_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
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 5a6f27827..f4d4e1620 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,7 +8,6 @@
{%- import 'net_map.j2' as nm with context %}
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- service.keepalived.cluster.single
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
@@ -22,6 +21,7 @@ classes:
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.glusterfs_repo
- cluster.mcp-common-ha.infra.kvm_pdf
- cluster.all-mcp-arch-common.opnfv.maas_proxy
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 043a9498f..85e69b666 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.apt_mirantis.openstack
- system.glusterfs.client.cluster
- system.nova.compute.cluster
- system.nova.compute.nfv.hugepages
@@ -17,6 +16,7 @@ classes:
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
- service.barbican.client.cluster
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.glusterfs_repo
- cluster.mcp-common-ha.openstack_compute_pdf
- cluster.all-mcp-arch-common.opnfv.maas_proxy
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 227205e38..cc4ed7d3d 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
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.ceilometer.client
- system.memcached.server.single
- system.keystone.server.cluster
@@ -45,6 +44,7 @@ classes:
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
+ - cluster.all-mcp-arch-common.backports
- 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_database.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
index 63d39748f..9ed3f70cd 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.galera.server.cluster
- system.galera.server.database.aodh
- system.galera.server.database.cinder
@@ -21,6 +20,7 @@ classes:
- system.galera.server.database.neutron
- system.galera.server.database.panko
- system.galera.server.database.barbican
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
keepalived_vip_interface: ${_param:single_nic}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml
index abc734481..1871c2efa 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml
@@ -7,9 +7,9 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
keepalived_vip_interface: ${_param:single_nic}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
index 979669312..cef23c9ee 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
@@ -20,6 +19,7 @@ classes:
- system.sphinx.server.doc.reclass
- service.keepalived.cluster.single
- system.keepalived.cluster.instance.openstack_web_public_vip
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
cluster_vip_address: ${_param:openstack_proxy_address}
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 1e9311aea..0ec9d25db 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
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- service.redis.server.single
- system.ceilometer.server.cluster
- system.ceilometer.server.coordination.redis
@@ -23,6 +22,7 @@ classes:
- system.gnocchi.common.storage.redis
- system.gnocchi.common.coordination.redis
- system.panko.server.cluster
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
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 e61bb99ff..8fd9db050 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -15,8 +15,8 @@ classes:
- system.ceilometer.client.nova_compute
- system.ceilometer.client.cinder_volume
- system.ceilometer.agent.polling.default
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- service.barbican.client.single
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-noha.openstack_compute_pdf
parameters:
_param:
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 c5e004ad1..a5a073b50 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,6 @@
---
classes:
- system.linux.system.lowmem
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- service.nfs.server
- system.ceilometer.client
- system.ceilometer.client.neutron
@@ -67,6 +66,7 @@ classes:
- system.galera.server.database.tacker
- service.tacker.server.single
{%- endif %}
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-noha.haproxy_openstack_api
- cluster.mcp-common-noha.openstack_control_pdf
parameters:
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 d97ac7a5c..5100add1f 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.apt_mirantis.openstack
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-noha.openstack_gateway_pdf
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
index ae787ec9a..7b8cf2017 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
@@ -7,9 +7,9 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- service.opendaylight.server.single
- service.quagga.server.single
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-odl-noha
- cluster.mcp-odl-noha.opendaylight.control_pdf
parameters: