Merge "Ironic system upgrade metadata"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 0bce371..97c1fe8 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -90,6 +90,9 @@
ironic_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
ironic_memcache_secret_key: ''
ironic_console_enabled: true
+ ironic_old_version: ${_param:openstack_old_version}
+ ironic_version: ${_param:openstack_version}
+ ironic_upgrade_enabled: ${_param:openstack_upgrade_enabled}
# Keystone
keystone_old_version: ${_param:openstack_old_version}
keystone_version: ${_param:openstack_version}
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index 7119872..d343e28 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.cluster
+- system.ironic.upgrade
parameters:
linux:
system:
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 47b64de..0e5d61e 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.single
+- system.ironic.upgrade
parameters:
linux:
system:
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 917b8d0..b733a87 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.cluster
+- system.ironic.upgrade
parameters:
_param:
ironic_conductor_api_url_protocol: 'http'
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 9cd2e06..752f1cf 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -2,6 +2,7 @@
- system.salt.minion.cert.mysql.clients.openstack.ironic
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.single
+- system.ironic.upgrade
parameters:
linux:
system:
diff --git a/ironic/upgrade/init.yml b/ironic/upgrade/init.yml
new file mode 100644
index 0000000..ebd9bfd
--- /dev/null
+++ b/ironic/upgrade/init.yml
@@ -0,0 +1,6 @@
+parameters:
+ ironic:
+ upgrade:
+ enabled: ${_param:ironic_upgrade_enabled}
+ old_release: ${_param:ironic_old_version}
+ new_release: ${_param:ironic_version}