diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-03 10:31:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-03 10:31:44 +0000 |
| commit | 6b8c34b27a324120f6945f7873f479d37ba2e516 (patch) | |
| tree | d4dea5dfda9cdffb7aa8bd54b17249bb74e74c24 /docker | |
| parent | 52fa7c6f511218e961e6cc02073898e6ac5ae706 (diff) | |
| parent | 3c6ec654b45fa1490cd452404ada735397852e38 (diff) | |
Merge "Bump template version for all templates to "ocata""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/firstboot/install_docker_agents.yaml | 2 | ||||
| -rw-r--r-- | docker/post.j2.yaml | 2 | ||||
| -rw-r--r-- | docker/services/neutron-ovs-agent.yaml | 2 | ||||
| -rw-r--r-- | docker/services/nova-compute.yaml | 2 | ||||
| -rw-r--r-- | docker/services/nova-libvirt.yaml | 2 | ||||
| -rw-r--r-- | docker/services/services.yaml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/firstboot/install_docker_agents.yaml b/docker/firstboot/install_docker_agents.yaml index f6d61e2d..41a87406 100644 --- a/docker/firstboot/install_docker_agents.yaml +++ b/docker/firstboot/install_docker_agents.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: ocata parameters: DockerAgentImage: diff --git a/docker/post.j2.yaml b/docker/post.j2.yaml index f4d47aa6..41d33895 100644 --- a/docker/post.j2.yaml +++ b/docker/post.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-10-14 +heat_template_version: ocata description: > Post-deploy configuration steps via puppet for all roles, diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 8d092a34..56bd073e 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2015-04-30 +heat_template_version: ocata description: > OpenStack Neutron openvswitch service diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 5c56aeee..c695c94d 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2015-04-30 +heat_template_version: ocata description: > OpenStack containerized Nova Compute service diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index 36511557..2dfeed59 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2015-04-30 +heat_template_version: ocata description: > OpenStack Libvirt Service diff --git a/docker/services/services.yaml b/docker/services/services.yaml index 37e7b655..3d51eb19 100644 --- a/docker/services/services.yaml +++ b/docker/services/services.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-10-14 +heat_template_version: ocata description: > Utility stack to convert an array of services into a set of combined |