1. devstack
  2. Commit 779d8670287952b8865a1d506ba2d68406139430
Browse code

Force heat deferred_auth_method to password in standalone mode

Heat does not support Keystone Trusts when deployed in standalone
mode. This change forces an error when HEAT_DEFERRED_AUTH is set
to anything other than "password" if HEAT_STANDALONE is True and
advises of the acceptable setting.

Change-Id: Ib4ee9d9af396093137a2a0f99f1b18ae153ccdb3
Closes-Bug: #1463837

Joe D'Andrea authored on 2015/12/01 00:35:13
Showing 1 changed files
lib/heat
History View file @ 779d867
... ... 
@@ -65,6 +65,12 @@ if [[ "$HEAT_STANDALONE" = "True" ]]; then
65 65 
     # for standalone, use defaults which require no service user
66 66 
     HEAT_STACK_DOMAIN=$(trueorfalse False HEAT_STACK_DOMAIN)
67 67 
     HEAT_DEFERRED_AUTH=${HEAT_DEFERRED_AUTH:-password}
68 
+    if [[ ${HEAT_DEFERRED_AUTH} != "password" ]]; then
69 
+        # Heat does not support keystone trusts when deployed in
70 
+        # standalone mode
71 
+        die $LINENO \
72 
+            'HEAT_DEFERRED_AUTH can only be set to "password" when HEAT_STANDALONE is True.'
73 
+    fi
68 74 
 else
69 75 
     HEAT_STACK_DOMAIN=$(trueorfalse True HEAT_STACK_DOMAIN)
70 76 
     HEAT_DEFERRED_AUTH=${HEAT_DEFERRED_AUTH:-trusts}