aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/ironic-api.yaml
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2017-06-12 15:16:06 +0200
committerDmitry Tantsur <divius.inside@gmail.com>2017-06-21 15:57:10 +0200
commitf80c937f32907c1db56f254c4aaa447b56240703 (patch)
treeeb0e4c2a8b47e901157820894f8188ba60178b88 /docker/services/ironic-api.yaml
parentdfd4e12b22e09bb95272541461f10578a511ee90 (diff)
Deploy ironic-api with WSGI
Change-Id: Ifa985f29fbd589f58cb2fc75b5f442f7651fb2bf Depends-On: I952c86db88dcd611722a3feaea88f618eee17620
Diffstat (limited to 'docker/services/ironic-api.yaml')
-rw-r--r--docker/services/ironic-api.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index a32176a..1c8aa5b 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -61,6 +61,7 @@ outputs:
config_settings:
map_merge:
- get_attr: [IronicApiBase, role_data, config_settings]
+ - apache::default_vhost: false
step_config: &step_config
get_attr: [IronicApiBase, role_data, step_config]
service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
@@ -75,7 +76,7 @@ outputs:
- [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/ironic_api.json:
- command: /usr/bin/ironic-api
+ command: /usr/sbin/httpd -DFOREGROUND
permissions:
- path: /var/log/ironic
owner: ironic:ironic
@@ -113,7 +114,7 @@ outputs:
start_order: 10
image: *ironic_image
net: host
- privileged: false
+ user: root
restart: always
volumes:
list_concat:
@@ -121,6 +122,10 @@ outputs:
-
- /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/etc/ironic:/etc/ironic:ro
+ - /var/lib/config-data/ironic/etc/httpd/conf/:/etc/httpd/conf/:ro
+ - /var/lib/config-data/ironic/etc/httpd/conf.d/:/etc/httpd/conf.d/:ro
+ - /var/lib/config-data/ironic/etc/httpd/conf.modules.d/:/etc/httpd/conf.modules.d/:ro
+ - /var/lib/config-data/ironic/var/www/:/var/www/:ro
- /var/log/containers/ironic:/var/log/ironic
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS