Browse code

Merge "Add support for role and resource keystone backends"

Jenkins authored on 2016/01/16 22:38:55
Showing 1 changed files
... ...
@@ -68,6 +68,12 @@ KEYSTONE_IDENTITY_BACKEND=${KEYSTONE_IDENTITY_BACKEND:-sql}
68 68
 # Select the Assignment backend driver
69 69
 KEYSTONE_ASSIGNMENT_BACKEND=${KEYSTONE_ASSIGNMENT_BACKEND:-sql}
70 70
 
71
+# Select the Role backend driver
72
+KEYSTONE_ROLE_BACKEND=${KEYSTONE_ROLE_BACKEND:-sql}
73
+
74
+# Select the Resource backend driver
75
+KEYSTONE_RESOURCE_BACKEND=${KEYSTONE_RESOURCE_BACKEND:-sql}
76
+
71 77
 # Select Keystone's token provider (and format)
72 78
 # Choose from 'uuid', 'pki', 'pkiz', or 'fernet'
73 79
 KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-}
... ...
@@ -209,6 +215,8 @@ function configure_keystone {
209 209
 
210 210
     iniset $KEYSTONE_CONF identity driver "$KEYSTONE_IDENTITY_BACKEND"
211 211
     iniset $KEYSTONE_CONF assignment driver "$KEYSTONE_ASSIGNMENT_BACKEND"
212
+    iniset $KEYSTONE_CONF role driver "$KEYSTONE_ROLE_BACKEND"
213
+    iniset $KEYSTONE_CONF resource driver "$KEYSTONE_RESOURCE_BACKEND"
212 214
 
213 215
     iniset_rpc_backend keystone $KEYSTONE_CONF
214 216