From 9eb9622749ccf1375e7e934318b8fe9a0aec5f5b Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Tue, 6 Jun 2017 17:25:20 +0800 Subject: [PATCH] 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 --- ansible/roles/tempest/defaults/main.yml | 2 ++ ansible/roles/tempest/templates/tempest.conf.j2 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/roles/tempest/defaults/main.yml b/ansible/roles/tempest/defaults/main.yml index ec7fd83a7f..0ba8fed161 100644 --- a/ansible/roles/tempest/defaults/main.yml +++ b/ansible/roles/tempest/defaults/main.yml @@ -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:) diff --git a/ansible/roles/tempest/templates/tempest.conf.j2 b/ansible/roles/tempest/templates/tempest.conf.j2 index 6cf35df7c0..8b65b837b2 100644 --- a/ansible/roles/tempest/templates/tempest.conf.j2 +++ b/ansible/roles/tempest/templates/tempest.conf.j2 @@ -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 }}