Merge "Add validation to domain logic"

keystone/templates/bin/_domain-manage.py.tpl

@@ -1,8 +1,21 @@
-import requests
-import json
-import yaml
-import sys
+#!/usr/bin/python
+{{/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+import json
+import requests
+import sys
 
 def main(args):
     base_url, token, domainId, domainName, filename = args[1], args[2], args[3], args[4], args[5]

tools/deployment/developer/ldap/080-keystone.sh

@@ -61,6 +61,16 @@ openstack user list --domain ldapdomain
 
 openstack role add --user bob --project admin --user-domain ldapdomain --project-domain default admin
 
+domain="ldapdomain"
+domainId=$(openstack domain show ${domain} -f value -c id)
+token=$(openstack token issue -f value -c id)
+
 #NOTE: Testing we can auth against the LDAP user
 unset OS_CLOUD
-openstack --os-auth-url http://keystone.openstack.svc.cluster.local/v3 --os-username bob --os-password password --os-user-domain-name ldapdomain --os-identity-api-version 3 token issue
+openstack --os-auth-url http://keystone.openstack.svc.cluster.local/v3 --os-username bob --os-password password --os-user-domain-name ${domain} --os-identity-api-version 3 token issue
+
+#NOTE: Test the domain specific thing works
+curl --verbose -X GET \
+  -H "Content-Type: application/json" \
+  -H "X-Auth-Token: $token" \
+  http://keystone.openstack.svc.cluster.local/v3/domains/${domainId}/config