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/manila/client/init.yml b/manila/client/init.yml
index 2fdadfd..268a1d1 100644
--- a/manila/client/init.yml
+++ b/manila/client/init.yml
@@ -2,3 +2,4 @@
- service.manila.client
- system.keystone.client.os_client_config.admin_identity
- system.manila.client.share_type
+- system.manila.upgrade
\ No newline at end of file
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index a821aa3..57ced1d 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -1,5 +1,6 @@
classes:
- service.manila.common.cluster
+- system.manila.upgrade
- system.salt.minion.cert.mysql.clients.openstack.manila
- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
@@ -7,7 +8,7 @@
manila_cluster_vip_address: ${_param:cluster_vip_address}
manila:
common:
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
message_queue:
engine: rabbitmq
port: ${_param:openstack_rabbitmq_port}
diff --git a/manila/common/single.yml b/manila/common/single.yml
index d91a115..00f42eb 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -1,11 +1,12 @@
classes:
- service.manila.common.single
+- system.manila.upgrade
- system.salt.minion.cert.mysql.clients.openstack.manila
- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
manila:
common:
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
message_queue:
engine: rabbitmq
port: ${_param:openstack_rabbitmq_port}
diff --git a/manila/control/cluster.yml b/manila/control/cluster.yml
index 75b6f76..087748b 100644
--- a/manila/control/cluster.yml
+++ b/manila/control/cluster.yml
@@ -7,11 +7,11 @@
manila:
common:
dhss: false
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
api:
enabled: true
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
role: ${_param:openstack_node_role}
scheduler:
enabled: true
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
diff --git a/manila/control/single.yml b/manila/control/single.yml
index 9d5f9f6..0b804c1 100644
--- a/manila/control/single.yml
+++ b/manila/control/single.yml
@@ -8,11 +8,11 @@
common:
dhss: false
default_share_type: default
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
api:
role: ${_param:openstack_node_role}
enabled: true
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
scheduler:
enabled: true
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
diff --git a/manila/share/init.yml b/manila/share/init.yml
index 346bfcd..6eb4163 100644
--- a/manila/share/init.yml
+++ b/manila/share/init.yml
@@ -4,7 +4,7 @@
manila:
common:
dhss: false
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
share:
enabled: true
- version: ${_param:openstack_version}
+ version: ${_param:manila_version}
diff --git a/manila/upgrade/init.yml b/manila/upgrade/init.yml
new file mode 100644
index 0000000..43e2021
--- /dev/null
+++ b/manila/upgrade/init.yml
@@ -0,0 +1,6 @@
+parameters:
+ manila:
+ upgrade:
+ enabled: ${_param:manila_upgrade_enabled}
+ old_release: ${_param:manila_old_version}
+ new_release: ${_param:manila_version}
\ No newline at end of file