summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-07-21 17:45:09 +0100
committerEmilien Macchi <emilien@redhat.com>2017-08-12 10:40:57 +0000
commitec58a4b6c5955736ec20b03496f03b281d6720ef (patch)
treef9fe1232fdcfb0ed1b1ce9b346e9a185919bd615
parent1801565a75018fea1d6c8fd30543c9b238167652 (diff)
Add environment to disable deploy steps
This enables either deploying without configuring any services, or temporarily disabling the deploy steps such as will be required for minor updates where we want to re-run the rolling update outside of heat. To deploy directly via ansible-playbook you can do e.g: openstack overcloud config download --config-dir tmpconfig cd tmpconfig/tripleo-6b02U7-config ansible-playbook -vvv -b -i /usr/bin/tripleo-ansible-inventory deploy_steps_playbook.yaml Which will run the same ansible steps as we normally run via heat. Change-Id: I59947b67523dfcc43d454d4ac7d82b06804cf71d
-rw-r--r--common/deploy-steps.j22
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml2
2 files changed, 3 insertions, 1 deletions
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index b798a67f..b36bb97a 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -244,7 +244,7 @@ resources:
{% for step in range(1, deploy_steps_max) %}
{{role.name}}Deployment_Step{{step}}:
- type: OS::Heat::StructuredDeploymentGroup
+ type: OS::TripleO::DeploymentSteps
depends_on:
- WorkflowTasks_Step{{step}}_Execution
# TODO(gfidente): the following if/else condition
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index fdf3bf6a..63868b54 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -109,6 +109,8 @@ resource_registry:
OS::TripleO::DeployedServerEnvironment: OS::Heat::None
+ OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
+
# services
OS::TripleO::Services: common/services.yaml
OS::TripleO::Services::Apache: puppet/services/apache.yaml