Merge "Set identity.region with tempestconf explicitly"
This commit is contained in:
commit
c60c139547
@ -107,6 +107,7 @@ public_net_id=$(neutron net-show {{ public_net_name }} -f value -c id)
|
|||||||
{% else %}
|
{% else %}
|
||||||
public_net_id=$(openstack network show {{ public_net_name }} -f value -c id)
|
public_net_id=$(openstack network show {{ public_net_name }} -f value -c id)
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
region_name=${OS_REGION_NAME:-'regionOne'}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if not tempest_overcloud|bool %}
|
{% if not tempest_overcloud|bool %}
|
||||||
@ -147,6 +148,9 @@ $TEMPESTCONF --out etc/tempest.conf \
|
|||||||
DEFAULT.log_dir {{ tempest_log_dir }} \
|
DEFAULT.log_dir {{ tempest_log_dir }} \
|
||||||
DEFAULT.log_file {{ tempest_log_file }} \
|
DEFAULT.log_file {{ tempest_log_file }} \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if tempest_os_cloud != '' %}
|
||||||
|
identity.region $region_name \
|
||||||
|
{% endif %}
|
||||||
{% if release in ['newton', 'ocata', 'pike'] %}
|
{% if release in ['newton', 'ocata', 'pike'] %}
|
||||||
identity.uri $OS_AUTH_URL \
|
identity.uri $OS_AUTH_URL \
|
||||||
identity.admin_password $OS_PASSWORD \
|
identity.admin_password $OS_PASSWORD \
|
||||||
|
Loading…
Reference in New Issue
Block a user