aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-libvirt.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-libvirt.yaml
parent07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff)
parente76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff)
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/nova-libvirt.yaml')
-rw-r--r--docker/services/nova-libvirt.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 6257bcd..a552774 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -4,19 +4,13 @@ description: >
OpenStack Libvirt Service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerNovaLibvirtImage:
description: image
- default: 'centos-binary-nova-libvirt:latest'
type: string
# we configure libvirt via the nova-compute container due to coupling
# in the puppet modules
DockerNovaLibvirtConfigImage:
description: The container image to use for the nova_libvirt config_volume
- default: 'centos-binary-nova-compute:latest'
type: string
EnablePackageInstall:
default: 'false'
@@ -104,10 +98,7 @@ outputs:
config_volume: nova_libvirt
puppet_tags: nova_config
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtConfigImage} ]
+ config_image: {get_param: DockerNovaLibvirtConfigImage}
kolla_config:
/var/lib/kolla/config_files/nova_libvirt.json:
command:
@@ -127,10 +118,7 @@ outputs:
docker_config:
step_3:
nova_libvirt:
- image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtImage} ]
+ image: {get_param: DockerNovaLibvirtImage}
net: host
pid: host
privileged: true