diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-20 00:07:38 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-20 00:07:38 +0000 |
commit | ede56b7a8e2db78513b64996b0a0f5a1ce1904db (patch) | |
tree | 4bdf34955e5163379f28d75e3907040e514b2108 /docker | |
parent | 947485dd20fda613bbad2fa9ef2ef44f32fa26e4 (diff) | |
parent | 0a0e2ee629a143efe29bb00ffb06c90515f0e504 (diff) |
Merge "Update the template_version alias for all the templates to pike."
Diffstat (limited to 'docker')
-rw-r--r-- | docker/docker-steps.j2 | 2 | ||||
-rw-r--r-- | docker/firstboot/setup_docker_host.yaml | 2 | ||||
-rw-r--r-- | docker/services/containers-common.yaml | 2 | ||||
-rw-r--r-- | docker/services/database/mongodb.yaml | 2 | ||||
-rw-r--r-- | docker/services/database/mysql.yaml | 2 | ||||
-rw-r--r-- | docker/services/database/redis.yaml | 2 | ||||
-rw-r--r-- | docker/services/etcd.yaml | 2 | ||||
-rw-r--r-- | docker/services/neutron-plugin-ml2.yaml | 2 | ||||
-rw-r--r-- | docker/services/nova-metadata.yaml | 2 | ||||
-rw-r--r-- | docker/services/services.yaml | 2 | ||||
-rw-r--r-- | docker/services/swift-ringbuilder.yaml | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2 index 1d5605b2..d380191d 100644 --- a/docker/docker-steps.j2 +++ b/docker/docker-steps.j2 @@ -11,7 +11,7 @@ # primary role is: {{primary_role_name}} {% set deploy_steps_max = 6 -%} -heat_template_version: ocata +heat_template_version: pike description: > Post-deploy configuration steps via puppet for all roles, diff --git a/docker/firstboot/setup_docker_host.yaml b/docker/firstboot/setup_docker_host.yaml index 2f258987..4b061e1c 100644 --- a/docker/firstboot/setup_docker_host.yaml +++ b/docker/firstboot/setup_docker_host.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike parameters: DockerNamespace: diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml index fad1456c..a4ebe549 100644 --- a/docker/services/containers-common.yaml +++ b/docker/services/containers-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > Contains a static list of common things necessary for containers diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index ed4e3177..96a02f9f 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > MongoDB service deployment using puppet and docker diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index 3a4de24f..73578e13 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > MySQL service deployment using puppet diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml index 86c44900..73df96c5 100644 --- a/docker/services/database/redis.yaml +++ b/docker/services/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack containerized Redis services diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml index 13a0735b..e5a7096b 100644 --- a/docker/services/etcd.yaml +++ b/docker/services/etcd.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack containerized etcd services diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml index 2e5384ea..1739a5b9 100644 --- a/docker/services/neutron-plugin-ml2.yaml +++ b/docker/services/neutron-plugin-ml2.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack containerized Neutron ML2 Plugin configured with Puppet diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml index 2aebbb2f..e158d3bc 100644 --- a/docker/services/nova-metadata.yaml +++ b/docker/services/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack containerized Nova Metadata service diff --git a/docker/services/services.yaml b/docker/services/services.yaml index 15f1bf02..2ad3b63d 100644 --- a/docker/services/services.yaml +++ b/docker/services/services.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > Utility stack to convert an array of services into a set of combined diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml index 9ced8f27..bfd445d0 100644 --- a/docker/services/swift-ringbuilder.yaml +++ b/docker/services/swift-ringbuilder.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack Swift Ringbuilder |