aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-07 10:08:20 +0000
committerGerrit Code Review <review@openstack.org>2017-03-07 10:08:20 +0000
commita4c8067eec098c2efe5409ae1c9df2f5dbfc842f (patch)
tree672e9c703e8cee2e83f78b5bd6e29c0a36907815 /environments/docker.yaml
parentfcd1c14ef51ca55d16f581ec629496d414dd5387 (diff)
parentfb748ba307684bd71ceaa0765a22389f9385ae88 (diff)
Merge "Enable composable upgrades for docker service templates"
Diffstat (limited to 'environments/docker.yaml')
-rw-r--r--environments/docker.yaml7
1 files changed, 6 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: