aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-placement.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-15 06:19:13 +0000
committerGerrit Code Review <review@openstack.org>2017-07-15 06:19:13 +0000
commit2185b835602ffb276b8142db68d472611fdf127a (patch)
tree50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/nova-placement.yaml
parent07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff)
parente76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff)
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/nova-placement.yaml')
-rw-r--r--docker/services/nova-placement.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 18055bb..7350db2 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -4,17 +4,11 @@ description: >
OpenStack containerized Nova Placement API service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerNovaPlacementImage:
description: image
- default: 'centos-binary-nova-placement-api:latest'
type: string
DockerNovaPlacementConfigImage:
description: The container image to use for the nova_placement config_volume
- default: 'centos-binary-nova-placement-api:latest'
type: string
EndpointMap:
default: {}
@@ -75,10 +69,7 @@ outputs:
config_volume: nova_placement
puppet_tags: nova_config
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementConfigImage} ]
+ config_image: {get_param: DockerNovaPlacementConfigImage}
kolla_config:
/var/lib/kolla/config_files/nova_placement.json:
command: /usr/sbin/httpd -DFOREGROUND
@@ -96,10 +87,7 @@ outputs:
step_3:
nova_placement:
start_order: 1
- image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
+ image: {get_param: DockerNovaPlacementImage}
net: host
user: root
restart: always