Browse code

Merge "Enable keystone authentication in Ironic"

Jenkins authored on 2013/10/25 19:15:36
Showing 1 changed files
... ...
@@ -93,6 +93,8 @@ function configure_ironic() {
93 93
 # configure_ironic_api() - Is used by configure_ironic(). Performs
94 94
 # API specific configuration.
95 95
 function configure_ironic_api() {
96
+    iniset $IRONIC_CONF_FILE DEFAULT auth_strategy keystone
97
+    iniset $IRONIC_CONF_FILE DEFAULT policy_file $IRONIC_POLICY_JSON
96 98
     iniset $IRONIC_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
97 99
     iniset $IRONIC_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
98 100
     iniset $IRONIC_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL