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 "Make containerized nova-api run with httpd"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-api.yaml
diff --git
a/docker/services/nova-api.yaml
b/docker/services/nova-api.yaml
index
da46104
..
c73ad04
100644
(file)
--- a/
docker/services/nova-api.yaml
+++ b/
docker/services/nova-api.yaml
@@
-64,9
+64,6
@@
outputs:
map_merge:
- get_attr: [NovaApiBase, role_data, config_settings]
- apache::default_vhost: false
map_merge:
- get_attr: [NovaApiBase, role_data, config_settings]
- apache::default_vhost: false
- nova_wsgi_enabled: false
- nova::api::service_name: '%{::nova::params::api_service_name}'
- nova::wsgi::apache_api::ssl: false
step_config: &step_config
list_join:
- "\n"
step_config: &step_config
list_join:
- "\n"
@@
-82,7
+79,7
@@
outputs:
config_image: {get_param: DockerNovaConfigImage}
kolla_config:
/var/lib/kolla/config_files/nova_api.json:
config_image: {get_param: DockerNovaConfigImage}
kolla_config:
/var/lib/kolla/config_files/nova_api.json:
- command: /usr/
bin/nova-api
+ command: /usr/
sbin/httpd -DFOREGROUND
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
@@
-112,7
+109,7
@@
outputs:
user: root
volumes:
- /var/log/containers/nova:/var/log/nova
user: root
volumes:
- /var/log/containers/nova:/var/log/nova
- command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova']
+ command: ['/bin/bash', '-c', '
mkdir -p /var/log/httpd;
chown -R nova:nova /var/log/nova']
step_3:
nova_api_db_sync:
start_order: 0
step_3:
nova_api_db_sync:
start_order: 0
@@
-163,7
+160,7
@@
outputs:
start_order: 2
image: *nova_api_image
net: host
start_order: 2
image: *nova_api_image
net: host
- user:
nova
+ user:
root
privileged: true
restart: always
volumes:
privileged: true
restart: always
volumes: