Use the username/pass for authentication by default

Change-Id: I4a6911ef834d991fbc2aae27d2d125f9988161ec
This commit is contained in:
Jeffrey Zhang 2014-10-15 11:30:07 +08:00
parent 8900c2354f
commit a85e9ed9d7
1 changed files with 2 additions and 2 deletions

View File

@ -6,6 +6,6 @@
export OS_USERNAME=admin
export OS_PASSWORD={{ salt['pillar.get']('keystone:keystone:admin:password') }}
export OS_AUTH_URL=http://{{ salt["pillar.get"]("keystone:internal_ip") }}:5000/v2.0/
export SERVICE_TOKEN='{{ keystone_config.DEFAULT.admin_token }}'
export SERVICE_ENDPOINT=http://{{ salt["pillar.get"]("keystone:admin_ip") }}:35357/v2.0/
#export SERVICE_TOKEN='{{ keystone_config.DEFAULT.admin_token }}'
#export SERVICE_ENDPOINT=http://{{ salt["pillar.get"]("keystone:admin_ip") }}:35357/v2.0/
- template: jinja