Merge "Updated tests and role for Xenial support"

This commit is contained in:
Jenkins 2016-07-13 18:12:57 +00:00 committed by Gerrit Code Review
commit 02dd478ac5
6 changed files with 33 additions and 4 deletions

22
manual-test.rc Normal file
View File

@ -0,0 +1,22 @@
export VIRTUAL_ENV=$(pwd)
export ANSIBLE_HOST_KEY_CHECKING=False
export ANSIBLE_SSH_CONTROL_PATH=/tmp/%%h-%%r
# TODO (odyssey4me) These are only here as they are non-standard folder
# names for Ansible 1.9.x. We are using the standard folder names for
# Ansible v2.x. We can remove this when we move to Ansible 2.x.
export ANSIBLE_ACTION_PLUGINS=${HOME}/.ansible/plugins/action
export ANSIBLE_CALLBACK_PLUGINS=${HOME}/.ansible/plugins/callback
export ANSIBLE_FILTER_PLUGINS=${HOME}/.ansible/plugins/filter
export ANSIBLE_LOOKUP_PLUGINS=${HOME}/.ansible/plugins/lookup
# This is required as the default is the current path or a path specified
# in ansible.cfg
export ANSIBLE_LIBRARY=${HOME}/.ansible/plugins/library
# This is required as the default is '/etc/ansible/roles' or a path
# specified in ansible.cfg
export ANSIBLE_ROLES_PATH=${HOME}/.ansible/roles:$(pwd)/..
echo "Run manual functional tests by executing the following:"
echo "# ./.tox/functional/bin/ansible-playbook -i tests/inventory tests/test.yml -e \"rolename=$(pwd)\""

View File

@ -23,6 +23,7 @@ galaxy_info:
- name: Ubuntu
versions:
- trusty
- xenial
categories:
- cloud
- python

View File

@ -56,6 +56,12 @@
- horizon-install
- horizon-config
- name: Update the ca certificates
command: "update-ca-certificates -f"
when: not horizon_external_ssl|bool
tags:
- horizon-ssl
- include: horizon_service_setup.yml
tags:
- horizon-install

View File

@ -15,7 +15,6 @@
- name: Create test containers
hosts: all_containers
connection: local
gather_facts: false
pre_tasks:
- name: Destroy test containers

View File

@ -61,8 +61,8 @@ memcached_servers: 127.0.0.1
openrc_os_auth_url: "http://127.0.0.1:5000/v3"
openrc_os_domain_name: "Default"
openrc_os_password: "{{ keystone_auth_admin_password }}"
tempest_dashboard_login_url: "https://10.100.100.4/auth/login/"
tempest_dashboard_url: "https://10.100.100.4/"
tempest_dashboard_login_url: "https://{{ ansible_hostname }}/auth/login/"
tempest_dashboard_url: "https://{{ ansible_hostname }}/"
tempest_developer_mode: True
tempest_git_install_branch: master
tempest_venv_tag: "{{ tempest_git_install_branch }}"

View File

@ -20,6 +20,7 @@ horizon_apt_packages:
- apache2
- apache2-utils
- cron # required by the Ansible cron module
- git
- libapache2-mod-wsgi
- libssl-dev
- libxslt1.1