stsstack-bundles

Merge ~hopem/stsstack-bundles:keystone-saml into stsstack-bundles:master

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. keystone-saml
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: ef8fb9bce98305ae7de5b66ce42e487d2b0f9730
Proposed branch: ~hopem/stsstack-bundles:keystone-saml
Merge into: stsstack-bundles:master
Diff against target: 33 lines (+16/-0)
2 files modified
openstack/generate-bundle.sh (+3/-0)
overlays/keystone-saml.yaml (+13/-0)
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Openstack Charm Testers Pending
Review via email: mp+370302@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jorge Niedbalski (niedbalski) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/openstack/generate-bundle.sh b/openstack/generate-bundle.sh
2index d975810..78cfddb 100755
3--- a/openstack/generate-bundle.sh
4+++ b/openstack/generate-bundle.sh
5@@ -152,6 +152,9 @@ do
6 # useful for <= pike since queens is v3 only
7 overlays+=( "keystone-v3.yaml" )
8 ;;
9+ --keystone-saml)
10+ overlays+=( "keystone-saml.yaml" )
11+ ;;
12 --mysql-ha*)
13 get_units $1 __NUM_MYSQL_UNITS__ 3
14 overlays+=( "mysql-ha.yaml" )
15diff --git a/overlays/keystone-saml.yaml b/overlays/keystone-saml.yaml
16new file mode 100644
17index 0000000..f1da826
18--- /dev/null
19+++ b/overlays/keystone-saml.yaml
20@@ -0,0 +1,13 @@
21+applications:
22+ keystone-saml-mellon:
23+ charm: cs:~openstack-charmers-next/keystone-saml-mellon
24+ options:
25+ idp-name: 'samltest'
26+ protocol-name: 'mapped'
27+ user-facing-name: 'samltest.id'
28+ nameid-formats: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress'
29+relations:
30+ - [ keystone, keystone-saml-mellon ]
31+ - [ openstack-dashboard, keystone-saml-mellon ]
32+ - [ "openstack-dashboard:websso-trusted-dashboard", "keystone:websso-trusted-dashboard" ]
33+# TODO: implement resources

Subscribers

People subscribed via source and target branches