openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow container template to recognize an update"

Browse Source
This commit is contained in:
Jenkins
2016-01-25 18:07:25 +00:00
committed by Gerrit Code Review
parent 1d7167e0b7 2928886f88
commit 4c2e66a6d0
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/compute-post.yaml
View File

@@ -191,7 +191,6 @@ resources:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOvsVswitchdImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOvsVswitchdImage} ]
container_name: ovs-vswitchd
net: host net: host
privileged: true privileged: true
restart: always restart: always
@@ -207,7 +206,6 @@ resources:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchDBImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchDBImage} ]
container_name: ovsdb-server
net: host net: host
restart: always restart: always
volumes: volumes:
@@ -265,7 +263,6 @@ resources:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerLibvirtImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerLibvirtImage} ]
container_name: libvirt
net: host net: host
pid: host pid: host
privileged: true privileged: true
@@ -299,7 +296,6 @@ resources:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
container_name: openvswitch
net: host net: host
privileged: true privileged: true
restart: always restart: always
@@ -320,7 +316,6 @@ resources:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
container_name: neutronagent
net: host net: host
pid: host pid: host
privileged: true privileged: true
@@ -345,7 +340,6 @@ resources:
list_join: list_join:
- '/' - '/'
- [ {get_param: DockerNamespace}, {get_param: DockerComputeImage} ] - [ {get_param: DockerNamespace}, {get_param: DockerComputeImage} ]
container_name: novacompute
net: host net: host
privileged: true privileged: true
restart: always restart: always