summaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-29 11:30:40 +0000
committerGerrit Code Review <review@openstack.org>2017-06-29 11:30:40 +0000
commit3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (patch)
treefa5dfcd3a37d2edee8fe8947321feed65783b834 /docker/services
parent4221b013d36244759079d26ed834fb24e481f0b3 (diff)
parent47d1794abe3046d683237812cb4c916ab676ace7 (diff)
Merge "Enable nova-api to run over httpd again"
Diffstat (limited to 'docker/services')
-rw-r--r--docker/services/nova-api.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index c97f45de..c163d7ef 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -62,6 +62,9 @@ outputs:
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"