Merge "Moving nova-consoleauth to step4"

deployment/nova/nova-vnc-proxy-container-puppet.yaml

@@ -20,10 +20,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  AdminPassword:
-    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
-    type: string
-    hidden: true
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -103,7 +99,9 @@ parameters:
     constraints:
     - allowed_values: ['', 'UPGRADE']
     default: ''
-
+  RootStackName:
+    description: The name of the stack/plan.
+    type: string
 
 conditions:
 
@@ -402,19 +400,12 @@ outputs:
                 comment: qemu user
       post_upgrade_tasks:
         - when:
-            - step|int == 5
+            - step|int == 4
           tags:
             - never
             - system_upgrade_stop_services
           environment:
-            OS_USERNAME: admin
+            OS_CLOUD: {get_param: RootStackName}
-            OS_USER_DOMAIN_NAME: "Default"
-            OS_PROJECT_DOMAIN_NAME: "Default"
-            OS_PROJECT_NAME: admin
-            OS_PASSWORD: { get_param: AdminPassword }
-            OS_AUTH_URL: { get_param: [EndpointMap, KeystoneV3Public, uri] }
-            OS_IDENTITY_API_VERSION: 3
-            OS_AUTH_TYPE: password
           block:
             - name: Get nova-consoleauth service ID
               command: openstack compute service list --service nova-consoleauth --column ID  --column Host --format yaml