openstack/openstack-ansible
Code Issues Proposed changes

Fix failing tests in defcore test set

Browse Source 
Currently, running the defcore test set fails on a couple of tests due
to incorrect tempest.conf configuration.  This commit does the
following to address:

1. Creates new tempest_network_tenant_network_cidr and
   tempest_network_tenant_network_mask_bits role defaults

In tempest.conf, tenant_network_cidr expects to be a bigger network
which it can create smaller subnets from using
tenant_network_mask_bits.  We currently set tenant_network_cidr to
'192.168.74.0/24' with a tenant_network_mask_bits of '24', which
obviously won't work.  The var tempest_network_tenant_network_cidr now
defaults to '192.168.74.0/24'
and tempest_network_tenant_network_mask_bits defaulting to '28'.  The
actual tenant network (tempest_private_subnet_cidr) that we create is
now '192.168.74.0/28', which fits into tenant_network_cidr.

2. Creates new tempest_compute_ssh_user role default

Some tests were failing as they were attempting to ssh to booted
instances using username 'root', which was confusing as we already set
image_ssh_user to 'cirros'.  Oddly, it was attempting to use the
tempest config ssh_user so setting that to cirros also ensures those
tests pass.

Change-Id: Ib6396d765bc974675ed3841a1f22cb75ea8fce5a
This commit is contained in:
Matt Thompson 2016-01-18 10:52:51 +00:00
parent 8829c1d1a3
commit f16bb31008
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/os_tempest/defaults/main.yml
View File

@ -22,9 +22,12 @@ verbose: True
tempest_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/tempest.tgz
tempest_fatal_deprecations: False
tempest_private_subnet_cidr: "192.168.74.0/24"
# This needs to coincide with tempest_network_tenant_network_cidr and
# tempest_network_tenant_network_mask_bits below
tempest_private_subnet_cidr: "192.168.74.0/28"
tempest_public_subnet_cidr: "10.1.13.0/24"
tempest_compute_ssh_user: cirros
tempest_compute_image_ssh_user: cirros
tempest_compute_image_alt_ssh_user: cirros
tempest_compute_image_ssh_password: cubswin:)
@ -34,6 +37,8 @@ tempest_compute_console_output_enabled: True
tempest_compute_resize_enabled: True
tempest_compute_snapshot_enabled: True
tempest_compute_change_password: False
tempest_network_tenant_network_cidr: "192.168.74.0/24"
tempest_network_tenant_network_mask_bits: 28
tempest_dashboard_login_url: "https://{{ external_lb_vip_address }}/auth/login/"
tempest_dashboard_url: "https://{{ external_lb_vip_address }}/"

5
playbooks/roles/os_tempest/templates/tempest.conf.j2
View File

@ -41,6 +41,7 @@ flavor_ref_alt = 202
image_ssh_user = {{ tempest_compute_image_ssh_user }}
image_ssh_password = {{ tempest_compute_image_ssh_password }}
image_alt_ssh_user = {{ tempest_compute_image_alt_ssh_user }}
ssh_user = {{ tempest_compute_ssh_user }}
ssh_auth_method = configured
fixed_network_name = private
endpoint_type = internalURL
@ -125,8 +126,8 @@ api_v2 = {{ tempest_image_api_v2_enabled }}
[network]
endpoint_type = internalURL
tenant_network_cidr = {{ tempest_private_subnet_cidr }}
tenant_network_mask_bits = 24
tenant_network_cidr = {{ tempest_network_tenant_network_cidr }}
tenant_network_mask_bits = {{ tempest_network_tenant_network_mask_bits }}
tenant_networks_reachable = false
public_network_id = {{ tempest_neutron_public_network_id }}
floating_network_name = public