Add upgrades pillars in system
Currently upgrade pillar need to be set externally by pipeline
this patch allows to set them directly from system level.
Versions of components now will be easily managed by openstack_version
and openstack_old_version parameters.
Also manila version setting refactored to common style.
Change-Id: I4b1d06b4c144d2095d7916b37bbfa4c459652307
Related-Prod: https://mirantis.jira.com/browse/PROD-24991
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 681e990..6bb4e71 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -1,5 +1,6 @@
classes:
- service.ceilometer.agent.cluster
+- system.ceilometer.upgrade
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
ceilometer:
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index ada8cd5..037bb4e 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -1,5 +1,6 @@
classes:
- service.ceilometer.agent.single
+- system.ceilometer.upgrade
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
ceilometer:
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 73f6d5a..26f9a68 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -1,5 +1,6 @@
classes:
- service.ceilometer.agent.cluster.common
+- system.ceilometer.upgrade
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
ceilometer:
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index c86bee4..36f2f08 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -1,5 +1,6 @@
classes:
- service.ceilometer.agent.single.common
+- system.ceilometer.upgrade
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
ceilometer:
diff --git a/ceilometer/client/init.yml b/ceilometer/client/init.yml
index 5a0aaa0..ff75932 100644
--- a/ceilometer/client/init.yml
+++ b/ceilometer/client/init.yml
@@ -3,4 +3,5 @@
- system.ceilometer.client.keystone
- system.ceilometer.client.glance
- system.ceilometer.client.heat
-- system.ceilometer.client.nova_control
\ No newline at end of file
+- system.ceilometer.client.nova_control
+- system.ceilometer.upgrade
\ No newline at end of file
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 5e3c9a2..0704a2b 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -1,6 +1,7 @@
# This class is deprecated since Openstack Pike
classes:
- service.ceilometer.server.cluster
+- system.ceilometer.upgrade
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.openstack.ceilometer
- system.keepalived.cluster.instance.openstack_telemetry_vip
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index 9045f68..eeadcc0 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -1,5 +1,6 @@
classes:
- service.ceilometer.server.single
+- system.ceilometer.upgrade
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
ceilometer:
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index 81f6c38..c7d2686 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -1,6 +1,7 @@
# This class intended to be used since Openstack Pike release
classes:
- service.ceilometer.server.cluster.common
+- system.ceilometer.upgrade
- system.keepalived.cluster.instance.openstack_telemetry_vip
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 66b9431..1724277 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -1,5 +1,6 @@
classes:
- service.ceilometer.server.single.common
+- system.ceilometer.upgrade
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
ceilometer:
diff --git a/ceilometer/upgrade/init.yml b/ceilometer/upgrade/init.yml
new file mode 100644
index 0000000..c4cb18e
--- /dev/null
+++ b/ceilometer/upgrade/init.yml
@@ -0,0 +1,6 @@
+parameters:
+ ceilometer:
+ upgrade:
+ enabled: ${_param:ceilometer_upgrade_enabled}
+ old_release: ${_param:ceilometer_old_version}
+ new_release: ${_param:ceilometer_version}
\ No newline at end of file