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
Execute Swift ring up-/download in containerized environments
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-compute.yaml
diff --git
a/docker/services/nova-compute.yaml
b/docker/services/nova-compute.yaml
index
540e831
..
9f647eb
100644
(file)
--- a/
docker/services/nova-compute.yaml
+++ b/
docker/services/nova-compute.yaml
@@
-28,6
+28,7
@@
parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-73,7
+74,7
@@
outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
kolla_config:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
kolla_config:
- /var/lib/kolla/config_files/nova
-
compute.json:
+ /var/lib/kolla/config_files/nova
_
compute.json:
command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
permissions:
- path: /var/log/nova
command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
permissions:
- path: /var/log/nova
@@
-85,17
+86,17
@@
outputs:
docker_config:
# FIXME: run discover hosts here
step_4:
docker_config:
# FIXME: run discover hosts here
step_4:
- novacompute:
+ nova
_
compute:
image: *nova_compute_image
net: host
privileged: true
image: *nova_compute_image
net: host
privileged: true
- user:
root
+ user:
nova
restart: always
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
restart: always
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/nova
-
compute.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/nova
_
compute.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
- /dev:/dev
- /etc/iscsi:/etc/iscsi
- /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
- /dev:/dev
- /etc/iscsi:/etc/iscsi