Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Keep existing data for containerized ironic-conductor"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-libvirt.yaml
diff --git
a/docker/services/nova-libvirt.yaml
b/docker/services/nova-libvirt.yaml
index
e25b201
..
85fabe5
100644
(file)
--- a/
docker/services/nova-libvirt.yaml
+++ b/
docker/services/nova-libvirt.yaml
@@
-14,7
+14,7
@@
parameters:
type: string
# we configure libvirt via the nova-compute container due to coupling
# in the puppet modules
type: string
# we configure libvirt via the nova-compute container due to coupling
# in the puppet modules
- DockerNovaCo
mpute
Image:
+ DockerNovaCo
nfig
Image:
description: image
default: 'centos-binary-nova-compute:latest'
type: string
description: image
default: 'centos-binary-nova-compute:latest'
type: string
@@
-57,7
+57,7
@@
outputs:
config_image:
list_join:
- '/'
config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaCo
mpute
Image} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerNovaCo
nfig
Image} ]
kolla_config:
/var/lib/kolla/config_files/nova-libvirt.json:
command: /usr/sbin/libvirtd --config /etc/libvirt/libvirtd.conf
kolla_config:
/var/lib/kolla/config_files/nova-libvirt.json:
command: /usr/sbin/libvirtd --config /etc/libvirt/libvirtd.conf