diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-07 10:08:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-07 10:08:20 +0000 |
| commit | a4c8067eec098c2efe5409ae1c9df2f5dbfc842f (patch) | |
| tree | 672e9c703e8cee2e83f78b5bd6e29c0a36907815 /environments | |
| parent | fcd1c14ef51ca55d16f581ec629496d414dd5387 (diff) | |
| parent | fb748ba307684bd71ceaa0765a22389f9385ae88 (diff) | |
Merge "Enable composable upgrades for docker service templates"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 7 | ||||
| -rw-r--r-- | environments/major-upgrade-composable-steps-docker.yaml | 10 | ||||
| -rw-r--r-- | environments/major-upgrade-converge-docker.yaml | 7 |
3 files changed, 23 insertions, 1 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index cb13c5c3..3696f908 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -1,5 +1,8 @@ resource_registry: - OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml + # This can be used when you don't want to run puppet on the host, + # e.g atomic, but it has been replaced with OS::TripleO::Services::Docker + # OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml + OS::TripleO::Services::Docker: ../puppet/services/docker.yaml #NOTE (dprince) add roles to be docker enabled as we support them OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml @@ -38,6 +41,8 @@ resource_registry: OS::TripleO::Services::SwiftRingBuilder: ../docker/services/swift-ringbuilder.yaml OS::TripleO::PostDeploySteps: ../docker/post.yaml + OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml + OS::TripleO::Services: ../docker/services/services.yaml parameter_defaults: diff --git a/environments/major-upgrade-composable-steps-docker.yaml b/environments/major-upgrade-composable-steps-docker.yaml new file mode 100644 index 00000000..5fa2f2d8 --- /dev/null +++ b/environments/major-upgrade-composable-steps-docker.yaml @@ -0,0 +1,10 @@ +resource_registry: + # FIXME(shardy) do we need to break major_upgrade_steps.yaml apart to + # enable docker specific logic, or is just overridding PostUpgradeSteps + # enough (as we want to share the ansible tasks steps etc) + OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml +parameter_defaults: + UpgradeLevelNovaCompute: auto + UpgradeInitCommonCommand: | + #!/bin/bash + # Ocata to Pike, put any needed host-level workarounds here diff --git a/environments/major-upgrade-converge-docker.yaml b/environments/major-upgrade-converge-docker.yaml new file mode 100644 index 00000000..463206f1 --- /dev/null +++ b/environments/major-upgrade-converge-docker.yaml @@ -0,0 +1,7 @@ +# Use this to reset any mappings only used for upgrades after the +# update of all nodes is completed +resource_registry: + OS::TripleO::PostDeploySteps: ../docker/post.yaml +parameter_defaults: + UpgradeLevelNovaCompute: '' + UpgradeInitCommonCommand: '' |