openstack
/
kolla-ansible
Code Issues Proposed changes

Set tempest image user var 

If we don't use cirros image, ``image_ssh_user = cirros`` is wrong,
so we should make it be variable.

Change-Id: I0a1d6999d1dbc8ce319f4bd504455dfd1fb5fceb
Closes-Bug: #1696088
This commit is contained in:
zhubingbing 2017-06-06 17:25:20 +08:00
parent 28e4ae81cf
commit 9eb9622749
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/tempest/defaults/main.yml
View File

@ -32,3 +32,5 @@ tempest_flavor_ref_id:
tempest_flavor_ref_alt_id: "{{ tempest_flavor_ref_id }}"
tempest_public_network_id:
tempest_floating_network_name:
tempest_image_ssh_user: cirros
tempest_image_ssh_password: cubswin:)

4
ansible/roles/tempest/templates/tempest.conf.j2
View File

@ -69,5 +69,5 @@ region = {{ openstack_region_name }}
api_v1 = False
[validation]
image_ssh_user = cirros
image_ssh_password = cubswin:)
image_ssh_user = {{ tempest_image_ssh_user }}
image_ssh_password = {{ tempest_image_ssh_password }}