@@ -42,6 +42,10 @@ Optional Arguments
4242--os-password <admin password>
4343--os-project-name <project_name>
4444--os-project-id <project_id>
45+ --os-user-domain-id <user_domain_id>
46+ --os-user-domain-name <user_domain_name>
47+ --os-project-domain-id <project_domain_id>
48+ --os-project-domain-name <project_domain_name>
4549--os-auth-url <auth_url>
4650--os-cacert <cert file>
4751--target-dir <target_directory>
@@ -54,7 +58,7 @@ $0 -P -C myproject -u myuser -p mypass
5458EOF
5559}
5660
57- if ! options=$( getopt -o hPAp:u:r:C: -l os-username:,os-password:,os-tenant-id:,os-tenant-name:,os-project-name:,os-project-id:,os-auth-url:,target-dir:,heat-url:,skip-project:,os-cacert:,help,debug -- " $@ " ) ; then
61+ if ! options=$( getopt -o hPAp:u:r:C: -l os-username:,os-password:,os-tenant-id:,os-tenant-name:,os-project-name:,os-project-id:,os-project-domain-id:,os-project-domain-name:,os-user-domain-id:,os-user-domain-name:,os- auth-url:,target-dir:,heat-url:,skip-project:,os-cacert:,help,debug -- " $@ " ) ; then
5862 display_help
5963 exit 1
6064fi
@@ -79,6 +83,10 @@ while [ $# -gt 0 ]; do
7983 --os-tenant-id) export OS_PROJECT_ID=$2 ; shift ;;
8084 --os-project-name) export OS_PROJECT_NAME=$2 ; shift ;;
8185 --os-project-id) export OS_PROJECT_ID=$2 ; shift ;;
86+ --os-user-domain-id) export OS_USER_DOMAIN_ID=$2 ; shift ;;
87+ --os-user-domain-name) export OS_USER_DOMAIN_NAME=$2 ; shift ;;
88+ --os-project-domain-id) export OS_PROJECT_DOMAIN_ID=$2 ; shift ;;
89+ --os-project-domain-name) export OS_PROJECT_DOMAIN_NAME=$2 ; shift ;;
8290 --skip-tenant) SKIP_PROJECT=" $SKIP_PROJECT $2 ," ; shift ;;
8391 --skip-project) SKIP_PROJECT=" $SKIP_PROJECT $2 ," ; shift ;;
8492 --os-auth-url) export OS_AUTH_URL=$2 ; shift ;;
@@ -128,6 +136,16 @@ if [ -z "$OS_AUTH_URL" ]; then
128136 export OS_AUTH_URL=http://localhost:5000/v2.0/
129137fi
130138
139+ if [ -z " $OS_USER_DOMAIN_ID " -a -z " $OS_USER_DOMAIN_NAME " ]; then
140+ # purposefully not exported as it would force v3 auth within this file.
141+ OS_USER_DOMAIN_ID=default
142+ fi
143+
144+ if [ -z " $OS_PROJECT_DOMAIN_ID " -a -z " $OS_PROJECT_DOMAIN_NAME " ]; then
145+ # purposefully not exported as it would force v3 auth within this file.
146+ OS_PROJECT_DOMAIN_ID=default
147+ fi
148+
131149USER_PASS=${USER_PASS:- $OS_PASSWORD }
132150USER_NAME=${USER_NAME:- $OS_USERNAME }
133151
@@ -219,6 +237,7 @@ export EC2_PRIVATE_KEY="$ec2_private_key"
219237export EC2_USER_ID=42 #not checked by nova (can be a 12-digit id)
220238export EUCALYPTUS_CERT="$ACCOUNT_DIR /cacert.pem"
221239export NOVA_CERT="$ACCOUNT_DIR /cacert.pem"
240+ export OS_AUTH_TYPE=v2password
222241EOF
223242 if [ -n " $ADDPASS " ]; then
224243 echo " export OS_PASSWORD=\" $user_passwd \" " >> " $rcfile "
227246 echo " export HEAT_URL=\" $HEAT_URL /$project_id \" " >> " $rcfile "
228247 echo " export OS_NO_CLIENT_AUTH=True" >> " $rcfile "
229248 fi
249+ for v in OS_USER_DOMAIN_ID OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_ID OS_PROJECT_DOMAIN_NAME; do
250+ if [ ${! v} ]; then
251+ echo " export $v =${! v} " >> " $rcfile "
252+ else
253+ echo " unset $v " >> " $rcfile "
254+ fi
255+ done
230256}
231257
232258# admin users expected
0 commit comments