diff options
author | Amy Fong <amy.fong@windriver.com> | 2014-07-29 14:09:01 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-30 00:50:59 -0400 |
commit | a3ce5306cdddb8f737f14d746ac1a892019836e3 (patch) | |
tree | fa62a74f29620e94e61971a6b9b78217466a032c /meta-openstack/recipes-devtools/python/python-keystone_git.bb | |
parent | 3b59cc8c9564bbf8df07eb4bb8991d1a32ac9c78 (diff) | |
download | meta-cloud-services-a3ce5306cdddb8f737f14d746ac1a892019836e3.tar.gz |
keystone: set default backend to ldap
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-keystone_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-keystone_git.bb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 59d2b7f..0e1ec0a 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb | |||
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ | |||
14 | file://openrc \ | 14 | file://openrc \ |
15 | file://keystone-search-in-etc-directory-for-config-files.patch \ | 15 | file://keystone-search-in-etc-directory-for-config-files.patch \ |
16 | file://keystone-remove-git-commands-in-tests.patch \ | 16 | file://keystone-remove-git-commands-in-tests.patch \ |
17 | file://hybrid-backend-setup \ | ||
18 | file://convert_keystone_backend.py \ | 17 | file://convert_keystone_backend.py \ |
19 | " | 18 | " |
20 | 19 | ||
@@ -103,6 +102,13 @@ do_install_append() { | |||
103 | sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" -i ${D}${sysconfdir}/init.d/keystone | 102 | sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" -i ${D}${sysconfdir}/init.d/keystone |
104 | 103 | ||
105 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | 104 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then |
105 | sed -i -e '/^\[identity\]/a \ | ||
106 | driver = keystone.identity.backends.hybrid_identity.Identity \ | ||
107 | \ | ||
108 | [assignment]\ | ||
109 | driver = keystone.assignment.backends.hybrid_assignment.Assignment\ | ||
110 | ' ${D}/etc/keystone/keystone.conf | ||
111 | |||
106 | sed -i -e '/^\[ldap\]/a \ | 112 | sed -i -e '/^\[ldap\]/a \ |
107 | url = ldap://localhost \ | 113 | url = ldap://localhost \ |
108 | user = cn=Manager,${LDAP_DN} \ | 114 | user = cn=Manager,${LDAP_DN} \ |
@@ -134,7 +140,6 @@ role_name_attribute = ou \ | |||
134 | role_tree_dn = ou=Roles,${LDAP_DN} \ | 140 | role_tree_dn = ou=Roles,${LDAP_DN} \ |
135 | ' ${D}/etc/keystone/keystone.conf | 141 | ' ${D}/etc/keystone/keystone.conf |
136 | 142 | ||
137 | install -m 0755 ${WORKDIR}/hybrid-backend-setup ${D}${sysconfdir}/keystone/hybrid-backend-setup | ||
138 | install -m 0755 ${WORKDIR}/convert_keystone_backend.py ${D}${sysconfdir}/keystone/convert_keystone_backend.py | 143 | install -m 0755 ${WORKDIR}/convert_keystone_backend.py ${D}${sysconfdir}/keystone/convert_keystone_backend.py |
139 | fi | 144 | fi |
140 | } | 145 | } |
@@ -159,6 +164,9 @@ pkg_postinst_${SRCNAME}-setup () { | |||
159 | keystone-manage db_sync | 164 | keystone-manage db_sync |
160 | keystone-manage pki_setup --keystone-user=root --keystone-group=root | 165 | keystone-manage pki_setup --keystone-user=root --keystone-group=root |
161 | 166 | ||
167 | if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | ||
168 | /etc/init.d/openldap start | ||
169 | fi | ||
162 | /etc/init.d/keystone start | 170 | /etc/init.d/keystone start |
163 | fi | 171 | fi |
164 | } | 172 | } |