@@ -815,7 +815,7 @@ function policy_add {

 # Gets or creates a domain

 # Usage: get_or_create_domain <name> <description>

 function get_or_create_domain {

-    local os_url="$KEYSTONE_SERVICE_URI/v3"

+    local os_url="$KEYSTONE_SERVICE_URI_V3"

     # Gets domain id

     local domain_id=$(

         # Gets domain id

@@ -831,6 +831,23 @@ function get_or_create_domain {

     echo $domain_id

 }

+# Gets or creates group

+# Usage: get_or_create_group <groupname> [<domain> <description>]

+function get_or_create_group {

+    local domain=${2:+--domain ${2}}

+    local desc="${3:-}"

+    local os_url="$KEYSTONE_SERVICE_URI_V3"

+    # Gets group id

+    local group_id=$(

+        # Creates new group with --or-show

+        openstack --os-token=$OS_TOKEN --os-url=$os_url \

+            --os-identity-api-version=3 group create $1 \

+            $domain --description "$desc" --or-show \

+            -f value -c id

+    )

+    echo $group_id

+}

+

 # Gets or creates user

 # Usage: get_or_create_user <username> <password> <project> [<email> [<domain>]]

 function get_or_create_user {

@@ -843,7 +860,7 @@ function get_or_create_user {

     local domain=""

     if [[ ! -z "$5" ]]; then

         domain="--domain=$5"

-        os_cmd="$os_cmd --os-url=$KEYSTONE_SERVICE_URI/v3 --os-identity-api-version=3"

+        os_cmd="$os_cmd --os-url=$KEYSTONE_SERVICE_URI_V3 --os-identity-api-version=3"

     fi

     # Gets user id

     local user_id=$(

@@ -868,7 +885,7 @@ function get_or_create_project {

     local domain=""

     if [[ ! -z "$2" ]]; then

         domain="--domain=$2"

-        os_cmd="$os_cmd --os-url=$KEYSTONE_SERVICE_URI/v3 --os-identity-api-version=3"

+        os_cmd="$os_cmd --os-url=$KEYSTONE_SERVICE_URI_V3 --os-identity-api-version=3"

     fi

     local project_id=$(

         # Creates new project with --or-show

@@ -265,23 +265,21 @@ function create_heat_accounts {

     if [[ "$HEAT_STACK_DOMAIN" == "True" ]]; then

         # Note we have to pass token/endpoint here because the current endpoint and

         # version negotiation in OSC means just --os-identity-api-version=3 won't work

-        local ks_endpoint_v3="$KEYSTONE_SERVICE_URI/v3"

-

-        D_ID=$(openstack --os-token $OS_TOKEN --os-url=$ks_endpoint_v3 \

+        D_ID=$(openstack --os-token $OS_TOKEN --os-url=$KEYSTONE_SERVICE_URI_V3 \

             --os-identity-api-version=3 domain list | grep ' heat ' | get_field 1)

         if [[ -z "$D_ID" ]]; then

-            D_ID=$(openstack --os-token $OS_TOKEN --os-url=$ks_endpoint_v3 \

+            D_ID=$(openstack --os-token $OS_TOKEN --os-url=$KEYSTONE_SERVICE_URI_V3 \

                 --os-identity-api-version=3 domain create heat \

                 --description "Owns users and projects created by heat" \

                 | grep ' id ' | get_field 2)

             iniset $HEAT_CONF DEFAULT stack_user_domain_id ${D_ID}

-            openstack --os-token $OS_TOKEN --os-url=$ks_endpoint_v3 \

+            openstack --os-token $OS_TOKEN --os-url=$KEYSTONE_SERVICE_URI_V3 \

                 --os-identity-api-version=3 user create --password $SERVICE_PASSWORD \

                 --domain $D_ID heat_domain_admin \

                 --description "Manages users and projects created by heat"

-            openstack --os-token $OS_TOKEN --os-url=$ks_endpoint_v3 \

+            openstack --os-token $OS_TOKEN --os-url=$KEYSTONE_SERVICE_URI_V3 \

                 --os-identity-api-version=3 role add \

                 --user heat_domain_admin --domain ${D_ID} admin

             iniset $HEAT_CONF DEFAULT stack_domain_admin heat_domain_admin

@@ -106,6 +106,10 @@ fi

 KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}:${KEYSTONE_AUTH_PORT}

 KEYSTONE_SERVICE_URI=${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}

+# V3 URIs

+KEYSTONE_AUTH_URI_V3=$KEYSTONE_AUTH_URI/v3

+KEYSTONE_SERVICE_URI_V3=$KEYSTONE_SERVICE_URI/v3

+

 # Functions

 # ---------

 # cleanup_keystone() - Remove residual data files, anything left over from previous

@@ -394,6 +398,9 @@ function create_keystone_accounts {

     get_or_add_user_role $another_role $demo_user $demo_tenant

     get_or_add_user_role $member_role $demo_user $invis_tenant

+    get_or_create_group "developers" "default" "openstack developers"

+    get_or_create_group "testers" "default"

+

     # Keystone

     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then

@@ -278,7 +278,7 @@ function configure_tempest {

     # Identity

     iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/"

-    iniset $TEMPEST_CONFIG identity uri_v3 "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v3/"

+    iniset $TEMPEST_CONFIG identity uri_v3 "$KEYSTONE_SERVICE_URI_V3"

     iniset $TEMPEST_CONFIG identity username $TEMPEST_USERNAME

     iniset $TEMPEST_CONFIG identity password "$password"

     iniset $TEMPEST_CONFIG identity tenant_name $TEMPEST_TENANT_NAME