diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-20 14:45:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-20 14:45:57 +0000 |
| commit | c2e00128aa296f19167331d6923e6c9cc9545c05 (patch) | |
| tree | 1f57a513d18e7ffb05ba460729ef62813d9d18d7 | |
| parent | 58d711e29f39d38660e5eaf6c6a06e1121d73af6 (diff) | |
| parent | 58c6988751c6d6b55cfc22aa87bc4f45b6509c2b (diff) | |
Merge "Run upgrade steps before post-deploy config"
| -rw-r--r-- | environments/major-upgrade-all-in-one.yaml | 8 | ||||
| -rw-r--r-- | overcloud.j2.yaml | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/environments/major-upgrade-all-in-one.yaml b/environments/major-upgrade-all-in-one.yaml new file mode 100644 index 00000000..69d72edd --- /dev/null +++ b/environments/major-upgrade-all-in-one.yaml @@ -0,0 +1,8 @@ +# We run the upgrade steps without disabling the OS::TripleO::PostDeploySteps +# this means you can do a major upgrade in one pass, which may be useful +# e.g for all-in-one deployments where we can upgrade the compute services +# at the same time as the controlplane +# Note that it will be necessary to pass a mapping of OS::Heat::None again for +# any subsequent updates, or the upgrade steps will run again. +resource_registry: + OS::TripleO::UpgradeSteps: ../puppet/major_upgrade_steps.yaml diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 80936497..f7e6f37f 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -587,9 +587,9 @@ resources: servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]} {% endfor %} - # Post deployment steps for all roles - AllNodesDeploySteps: - type: OS::TripleO::PostDeploySteps + # Upgrade steps for all roles + AllNodesUpgradeSteps: + type: OS::TripleO::UpgradeSteps depends_on: {% for role in roles %} - {{role.name}}AllNodesDeployment @@ -604,10 +604,10 @@ resources: {{role.name}}: {get_attr: [{{role.name}}ServiceChain, role_data]} {% endfor %} - # Upgrade steps for all roles - AllNodesUpgradeSteps: - type: OS::TripleO::UpgradeSteps - depends_on: AllNodesDeploySteps + # Post deployment steps for all roles + AllNodesDeploySteps: + type: OS::TripleO::PostDeploySteps + depends_on: AllNodesUpgradeSteps properties: servers: {% for role in roles %} @@ -618,7 +618,6 @@ resources: {{role.name}}: {get_attr: [{{role.name}}ServiceChain, role_data]} {% endfor %} - outputs: ManagedEndpoints: description: Asserts that the keystone endpoints have been provisioned. |