diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-24 20:44:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-24 20:44:49 +0000 |
| commit | 76c35757c9071dbafbaff1114ec2a2ccdeb388d6 (patch) | |
| tree | 8587f02e46cf9303ac91ae56a532aceeb73427dc | |
| parent | 7020a724049eb7b5f8bfbc503e5a233f97eadb32 (diff) | |
| parent | 67f94130d3da18dacec64509bee6313c07b34656 (diff) | |
Merge "Add disable_upgrade_deployment flag to roles_data.yaml"
| -rw-r--r-- | puppet/major_upgrade_steps.j2.yaml | 7 | ||||
| -rw-r--r-- | roles_data.yaml | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml index 9430a704..433b03a0 100644 --- a/puppet/major_upgrade_steps.j2.yaml +++ b/puppet/major_upgrade_steps.j2.yaml @@ -31,19 +31,23 @@ resources: {% if step > 0 %} depends_on: {% for dep in roles %} + {% if not dep.disable_upgrade_deployment|default(false) %} - {{dep.name}}Upgrade_Step{{step -1}} + {% endif %} {% endfor %} {% endif %} properties: UpgradeStepConfig: {get_param: [role_data, {{role.name}}, upgrade_tasks]} step: {{step}} - + {% if not role.disable_upgrade_deployment|default(false) %} {{role.name}}Upgrade_Step{{step}}: type: OS::Heat::StructuredDeploymentGroup {% if step > 0 %} depends_on: {% for dep in roles %} + {% if not dep.disable_upgrade_deployment|default(false) %} - {{dep.name}}Upgrade_Step{{step -1}} + {% endif %} {% endfor %} {% endif %} properties: @@ -53,6 +57,7 @@ resources: input_values: role: {{role.name}} update_identifier: {get_param: UpdateIdentifier} + {% endif %} {% endfor %} {% endfor %} diff --git a/roles_data.yaml b/roles_data.yaml index 561500c8..39cb56f9 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -17,6 +17,9 @@ # disable_constraints: (boolean) optional, whether to disable Nova and Glance # constraints for each role specified in the templates. # +# disable_upgrade_deployment: (boolean) optional, whether to run the composable upgrade +# steps for all services that are deployed on the particular role. +# # ServicesDefault: (list) optional default list of services to be deployed # on the role, defaults to an empty list. Sets the default for the # {{role.name}}Services parameter in overcloud.yaml @@ -109,6 +112,7 @@ - name: Compute CountDefault: 1 HostnameFormatDefault: '%stackname%-novacompute-%index%' + disable_upgrade_deployment: True ServicesDefault: - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient @@ -145,6 +149,7 @@ - OS::TripleO::Services::FluentdClient - name: ObjectStorage + disable_upgrade_deployment: True ServicesDefault: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Kernel @@ -159,6 +164,7 @@ - OS::TripleO::Services::FluentdClient - name: CephStorage + disable_upgrade_deployment: True ServicesDefault: - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephOSD |