Merge ~arif-ali/stsstack-bundles:horizon-ssl into stsstack-bundles:master

Proposed by Arif Ali
Status: Merged
Merged at revision: 3537b43d393f609f6881ce4e2d8d1b1b3a566b51
Proposed branch: ~arif-ali/stsstack-bundles:horizon-ssl
Merge into: stsstack-bundles:master
Diff against target: 24 lines (+7/-0)
1 file modified
overlays/openstack-dashboard.yaml (+7/-0)
Reviewer Review Type Date Requested Status
Felipe Reyes Approve
Review via email: mp+396264@code.launchpad.net

Commit message

Add SSL for horizon

To post a comment you must log in.
Revision history for this message
Felipe Reyes (freyes) wrote :

LGTM, thanks Arif.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/overlays/openstack-dashboard.yaml b/overlays/openstack-dashboard.yaml
2index ed89f3c..1d442a8 100644
3--- a/overlays/openstack-dashboard.yaml
4+++ b/overlays/openstack-dashboard.yaml
5@@ -1,6 +1,10 @@
6 # Variables
7 openstack_origin: &openstack_origin __OS_ORIGIN__
8
9+ssl_ca: &ssl_ca __SSL_CA__
10+ssl_cert: &ssl_cert __SSL_CERT__
11+ssl_key: &ssl_key __SSL_KEY__
12+
13 applications:
14 openstack-dashboard:
15 num_units: __NUM_HORIZON_UNITS__
16@@ -9,5 +13,8 @@ applications:
17 options:
18 openstack-origin: *openstack_origin
19 webroot: '/'
20+ ssl_ca: *ssl_ca
21+ ssl_key: *ssl_key
22+ ssl_cert: *ssl_cert
23 relations:
24 - [ "openstack-dashboard:identity-service", "keystone:identity-service" ]

Subscribers

People subscribed via source and target branches