commit 38aad4cfd7a9a2143a338ecebc1f847d760df7e8
author Jenkins <jenkins@review.openstack.org> Thu Oct 02 20:36:57 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Oct 02 20:36:57 2014 +0000
tree 4602762111ee0a6f3659f02a703fdcba0050d2e4
parent 4e10843812a25dd3645bf25f166d9be20ce242a0
parent 82d6e537522083749a664b99e1bdca2d8a33c6b9

Merge "don't set nova.conf auth_strategy"

lib/nova

diff --git a/lib/nova b/lib/nova
index c24bc2f..096d380 100644
--- a/lib/nova
+++ b/lib/nova
@@ -405,7 +405,6 @@
     rm -f $NOVA_CONF
     iniset $NOVA_CONF DEFAULT verbose "True"
     iniset $NOVA_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
-    iniset $NOVA_CONF DEFAULT auth_strategy "keystone"
     iniset $NOVA_CONF DEFAULT allow_resize_to_same_host "True"
     iniset $NOVA_CONF DEFAULT allow_migrate_to_same_host "True"
     iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI"