Ansible 2.1.1 role testing

Co-Authored-By: Major Hayden <major@mhtx.net> Change-Id: I850e7573a279ea317ee6743eae03e23940163453 Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
2016-09-15 16:00:42 -05:00 · 2016-09-15 16:00:42 -05:00 · 3992b860e1
parent 968bcf84eb
commit 3992b860e1
16 changed files with 97 additions and 414 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,6 +29,7 @@ doc/build/
 *.log
 *.sql
 *.sqlite
+logs/*

 # OS generated files #
 ######################
@ -61,6 +62,10 @@ releasenotes/build

 # Test temp files
 tests/plugins
+tests/playbooks
+tests/test.retry

-# Vagrant testing artifacts
+# Vagrant artifacts
 .vagrant
+
+
--- a/manual-test.rc
+++ b/manual-test.rc
@ -0,0 +1,33 @@
+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)/..
+
+export ANSIBLE_SSH_ARGS="-o ControlMaster=no \
+  -o UserKnownHostsFile=/dev/null \
+  -o StrictHostKeyChecking=no \
+  -o ServerAliveInterval=64 \
+  -o ServerAliveCountMax=1024 \
+  -o Compression=no \
+  -o TCPKeepAlive=yes \
+  -o VerifyHostKeyDNS=no \
+  -o ForwardX11=no \
+  -o ForwardAgent=yes"
+
+echo "Run manual functional tests by executing the following:"
+echo "# ./.tox/functional/bin/ansible-playbook -i tests/inventory tests/test.yml -e \"rolename=$(pwd)\""
--- a/run_tests.sh
+++ b/run_tests.sh
@ -24,23 +24,23 @@ if [ ! "$(which pip)" ]; then
 fi

 # Install bindep and tox
-pip install bindep tox
+sudo pip install bindep tox

 # CentOS 7 requires two additional packages:
 #   redhat-lsb-core - for bindep profile support
 #   epel-release    - required to install python-ndg_httpsclient/python2-pyasn1
 if [ "$(which yum)" ]; then
-    yum -y install redhat-lsb-core epel-release
+    sudo yum -y install redhat-lsb-core epel-release
 fi

 # Install OS packages using bindep
 if apt-get -v >/dev/null 2>&1 ; then
-    apt-get update
+    sudo apt-get update
    DEBIAN_FRONTEND=noninteractive \
-      apt-get -q --option "Dpkg::Options::=--force-confold" \
+      sudo apt-get -q --option "Dpkg::Options::=--force-confold" \
      --assume-yes install `bindep -b -f bindep.txt test`
 else
-    yum install -y `bindep -b -f bindep.txt test`
+    sudo yum install -y `bindep -b -f bindep.txt test`
 fi

 # run through each tox env and execute the test
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-ansible_ssh_host: "{{ ansible_host }}"
 container_name: "{{ inventory_hostname }}"
 container_networks:
  management_address:
@ -22,17 +21,6 @@ container_networks:
    interface: "eth1"
    netmask: "255.255.255.0"
    type: "veth"
-  tunnel_address:
-    address: "{{ tunnel_address }}"
-    bridge: "br-vxlan"
-    interface: "eth2"
-    netmask: "255.255.255.0"
-    type: "veth"
-  vlan_address:
-    bridge: "br-vlan"
-    interface: "eth12"
-    netmask: null
-    type: "veth"
 physical_host: localhost
 properties:
  service_name: "{{ inventory_hostname }}"
--- a/tests/host_vars/localhost.yml
+++ b/tests/host_vars/localhost.yml
@ -1,6 +1,5 @@
-#!/bin/bash
-#
-# Copyright 2015, Rackspace US, Inc.
+---
+# Copyright 2016, Rackspace US, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@ -13,14 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#

-iptables -F
-iptables -X
-iptables -t nat -F
-iptables -t nat -X
-iptables -t mangle -F
-iptables -t mangle -X
-iptables -P INPUT ACCEPT
-iptables -P FORWARD ACCEPT
-iptables -P OUTPUT ACCEPT
+bridges:
+  - "br-mgmt"
+
+ansible_python_interpreter: "/usr/bin/python2"
--- a/tests/inventory
+++ b/tests/inventory
@ -1,7 +1,7 @@
 [all]
-localhost ansible_connection=local ansible_become=True neutron_local_ip=10.100.101.1
-infra1 ansible_host=10.100.102.101 ansible_become=True ansible_user=root tunnel_address=10.100.101.101
-openstack1 ansible_host=10.100.102.102 ansible_become=True ansible_user=root tunnel_address=10.100.101.102 neutron_local_ip=10.100.101.102
+localhost ansible_become=True
+infra1 ansible_host=10.100.100.2 ansible_become=True ansible_user=root
+openstack1 ansible_host=10.100.100.3 ansible_become=True ansible_user=root

 [all_containers]
 infra1
@ -13,9 +13,13 @@ infra1
 [galera_all]
 infra1

+[memcached_all]
+infra1
+
 [service_all:children]
 rabbitmq_all
 galera_all
+memcached_all

 [keystone_all]
 openstack1
--- a/tests/test-install-infra.yml
+++ b/tests/test-install-infra.yml
@ -1,32 +0,0 @@
---
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
- name: Playbook for deploying infra services
-  hosts: service_all
-  user: root
-  gather_facts: true
-  roles:
-    - role: "rabbitmq_server"
-      rabbitmq_cookie_token: secrete
-    - role: "galera_server"
-      galera_root_password: secrete
-      galera_root_user: root
-      galera_innodb_buffer_pool_size: 512M
-      galera_innodb_log_buffer_size: 32M
-      galera_server_id: "{{ inventory_hostname | string_2_int }}"
-      galera_wsrep_node_name: "{{ inventory_hostname }}"
-      galera_wsrep_provider_options:
-        - { option: "gcache.size", value: "32M" }
-      galera_server_id: "{{ inventory_hostname | string_2_int }}"
--- a/tests/test-install-keystone.yml
+++ b/tests/test-install-keystone.yml
@ -1,65 +0,0 @@
---
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
- name: Playbook for deploying keystone
-  hosts: keystone_all
-  user: root
-  gather_facts: true
-  pre_tasks:
-    - name: Ensure rabbitmq vhost
-      rabbitmq_vhost:
-        name: "{{ keystone_rabbitmq_vhost }}"
-        state: "present"
-      delegate_to: "10.100.102.101"
-      when: inventory_hostname == groups['keystone_all'][0]
-    - name: Ensure rabbitmq user
-      rabbitmq_user:
-        user: "{{ keystone_rabbitmq_userid }}"
-        password: "{{ keystone_rabbitmq_password }}"
-        vhost: "{{ keystone_rabbitmq_vhost }}"
-        configure_priv: ".*"
-        read_priv: ".*"
-        write_priv: ".*"
-        state: "present"
-      delegate_to: "10.100.102.101"
-      when: inventory_hostname == groups['keystone_all'][0]
-    - name: Create DB for service
-      mysql_db:
-        login_user: "root"
-        login_password: "secrete"
-        login_host: "localhost"
-        name: "{{ keystone_galera_database }}"
-        state: "present"
-      delegate_to: "10.100.102.101"
-      when: inventory_hostname == groups['keystone_all'][0]
-    - name: Grant access to the DB for the service
-      mysql_user:
-        login_user: "root"
-        login_password: "secrete"
-        login_host: "localhost"
-        name: "{{ keystone_galera_database }}"
-        password: "{{ keystone_container_mysql_password }}"
-        host: "{{ item }}"
-        state: "present"
-        priv: "{{ keystone_galera_database }}.*:ALL"
-      with_items:
-        - "localhost"
-        - "%"
-      delegate_to: "10.100.102.101"
-      when: inventory_hostname == groups['keystone_all'][0]
-  roles:
-    - role: os_keystone
-  vars_files:
-    - test-vars.yml
--- a/tests/test-install-watcher.yml
+++ b/tests/test-install-watcher.yml
@ -16,7 +16,7 @@
 - name: Playbook for deploying watcher
  hosts: watcher_all
  user: root
-  gather_facts: true
+  gather_facts: True
  pre_tasks:
    # NOTE: These are typically installed in the repo server where we build the
    #       watcher wheel
@ -34,7 +34,7 @@
      rabbitmq_vhost:
        name: "{{ watcher_rabbitmq_vhost }}"
        state: "present"
-      delegate_to: "10.100.102.101"
+      delegate_to: "{{ hostvars[groups['rabbitmq_all'][0]]['ansible_host'] }}"
      when: inventory_hostname == groups['watcher_all'][0]
    - name: Ensure rabbitmq user
      rabbitmq_user:
@ -45,7 +45,7 @@
        read_priv: ".*"
        write_priv: ".*"
        state: "present"
-      delegate_to: "10.100.102.101"
+      delegate_to: "{{ hostvars[groups['rabbitmq_all'][0]]['ansible_host'] }}"
      when: inventory_hostname == groups['watcher_all'][0]
    - name: Create DB for service
      mysql_db:
@ -54,7 +54,7 @@
        login_host: "{{ watcher_galera_address }}"
        name: "{{ watcher_galera_database }}"
        state: "present"
-      delegate_to: "10.100.102.101"
+      delegate_to: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
      when: inventory_hostname == groups['watcher_all'][0]
    - name: Grant access to the DB for the service
      mysql_user:
@ -69,10 +69,11 @@
      with_items:
        - "localhost"
        - "%"
-      delegate_to: "10.100.102.101"
+      delegate_to: "{{ hostvars[groups['rabbitmq_all'][0]]['ansible_host'] }}"
      when: inventory_hostname == groups['watcher_all'][0]

  roles:
-    - role: "{{ rolename | basename }}"
+    - role: "os_watcher"
  vars_files:
+    - playbooks/test-vars.yml
    - test-vars.yml
--- a/tests/test-nova-interfaces.cfg.j2
+++ b/tests/test-nova-interfaces.cfg.j2
@ -1,58 +0,0 @@
-## The default networking requires several bridges. These bridges were named to be informative
-## however they can be named what ever you like and is adaptable to any network infrastructure
-## environment. This file serves as an example of how to setup basic networking and was ONLY
-## built for the purpose of being an example and used expressly in the building of an ALL IN
-## ONE development environment.
-
-auto br-mgmt
-iface br-mgmt inet static
-    bridge_stp off
-    bridge_waitport 0
-    bridge_fd 0
-    # Notice the bridge port is the vlan tagged interface
-    bridge_ports none
-    address 10.100.102.1
-    netmask 255.255.255.0
-    offload-sg off
-
-auto br-vxlan
-iface br-vxlan inet static
-    bridge_stp off
-    bridge_waitport 0
-    bridge_fd 0
-    bridge_ports none
-    address 10.100.101.1
-    netmask 255.255.255.0
-    offload-sg off
-    # To ensure ssh checksum is correct
-    up /sbin/iptables -A POSTROUTING -t mangle -p tcp --dport 22 -j CHECKSUM --checksum-fill
-    down /sbin/iptables -D POSTROUTING -t mangle -p tcp --dport 22 -j CHECKSUM --checksum-fill
-    # To provide internet connectivity to instances
-    up /sbin/iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-    down /sbin/iptables -t nat -D POSTROUTING -o eth0 -j MASQUERADE
-
-auto br-vlan
-iface br-vlan inet static
-    bridge_stp off
-    bridge_waitport 0
-    bridge_fd 0
-    address 10.1.13.200
-    netmask 255.255.254.0
-    offload-sg off
-    # Create veth pair, don't bomb if already exists
-    pre-up ip link add br-vlan-veth type veth peer name eth12 || true
-    # Set both ends UP
-    pre-up ip link set br-vlan-veth up
-    pre-up ip link set eth12 up
-    # Delete veth pair on DOWN
-    post-down ip link del br-vlan-veth || true
-    bridge_ports br-vlan-veth
-
-# Add an additional address to br-vlan
-iface br-vlan inet static
-    # Flat network default gateway
-    # -- This needs to exist somewhere for network reachability
-    # -- from the router namespace for floating IP paths.
-    # -- Putting this here is primarily for tempest to work.
-    address 10.1.13.1
-    netmask 255.255.255.0
--- a/tests/test-prepare-containers.yml
+++ b/tests/test-prepare-containers.yml
@ -1,31 +0,0 @@
---
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
- name: Playbook for creating containers
-  hosts: all_containers
-  gather_facts: false
-  roles:
-    - role: "lxc_container_create"
-      lxc_container_backing_store: dir
-      global_environment_variables:
-        PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-  post_tasks:
-    - name: Wait for ssh to be available
-      local_action:
-        module: wait_for
-        port: "{{ ansible_ssh_port | default('22') }}"
-        host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
-        search_regex: OpenSSH
-        delay: 1
--- a/tests/test-prepare-host.yml
+++ b/tests/test-prepare-host.yml
@ -1,93 +0,0 @@
---
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
- name: Playbook for configuring the LXC host
-  hosts: localhost
-  pre_tasks:
-    - name: Clear iptables rules
-      shell: ./iptables-clear.sh
-    # Make sure OS does not have a stale package cache.
-    - name: Update apt cache
-      apt:
-        update_cache: yes
-      when: ansible_os_family == 'Debian'
-    - name: Ensure root's new public ssh key is in authorized_keys
-      authorized_key:
-        user: root
-        key: "{{ hostvars['localhost']['lxc_container_ssh_key'] }}"
-        manage_dir: no
-    - set_fact:
-        lxc_container_ssh_key: "{{ hostvars['localhost']['lxc_container_ssh_key'] }}"
-    - name: Check if this is an OpenStack-CI nodepool instance
-      stat:
-        path: /etc/nodepool/provider
-      register: nodepool
-    - name: Set the files to copy into the container cache for OpenStack-CI instances
-      set_fact:
-        lxc_container_cache_files:
-          - { src: '/etc/pip.conf', dest: '/etc/pip.conf' }
-      when: nodepool.stat.exists | bool
-  post_tasks:
-    - name: Ensure that /etc/network/interfaces.d/ exists
-      file:
-        path: /etc/network/interfaces.d/
-        state: directory
-      tags:
-        - networking-dir-create
-
-    - name: Copy network configuration
-      template:
-        src: test-nova-interfaces.cfg.j2
-        dest: /etc/network/interfaces.d/nova_interfaces.cfg
-      register: nova_interfaces
-      tags:
-        - networking-interfaces-file
-
-    - name: Ensure our interfaces.d configuration files are loaded automatically
-      lineinfile:
-        dest: /etc/network/interfaces
-        line: "source /etc/network/interfaces.d/*.cfg"
-      tags:
-        - networking-interfaces-load
-
-    - name: Shut down the network interfaces
-      command: "ifdown {{ item }}"
-      when: nova_interfaces | changed
-      with_items:
-        - br-mgmt
-        - br-vlan
-        - br-vxlan
-      tags:
-        - networking-interfaces-stop
-
-    - name: Start the network interfaces
-      command: "ifup {{ item }}"
-      when: nova_interfaces | changed
-      with_items:
-        - br-mgmt
-        - br-vlan
-        - br-vxlan
-      tags:
-        - networking-interfaces-start
-    - name: Add iptables rules for lxc natting
-      command: /usr/local/bin/lxc-system-manage iptables-create
-  roles:
-    - role: "lxc_hosts"
-      lxc_net_address: 10.100.100.1
-      lxc_net_netmask: 255.255.255.0
-      lxc_net_dhcp_range: 10.100.100.2,10.100.100.99
-      lxc_net_bridge: lxcbr0
-      lxc_kernel_options:
-        - { key: 'fs.inotify.max_user_instances', value: 1024 }
--- a/tests/test-prepare-keys.yml
+++ b/tests/test-prepare-keys.yml
@ -1,33 +0,0 @@
---
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# NOTE: we use become_user because setting become: no or become: false
-#       doesn't seem to override the ansible_become=true in the
-#       inventory
- name: Playbook for establishing ssh keys
-  hosts: localhost
-  become_user: "{{ ansible_ssh_user }}"
-  pre_tasks:
-    - name: Create ssh key pair for root
-      user:
-        name: "{{ ansible_ssh_user }}"
-        generate_ssh_key: "yes"
-        ssh_key_bits: 2048
-        ssh_key_file: ".ssh/id_rsa"
-    - name: Get the calling user's key
-      command: cat ~/.ssh/id_rsa.pub
-      register: key_get
-    - set_fact:
-        lxc_container_ssh_key: "{{ key_get.stdout }}"
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@ -13,51 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-debug: true
-external_lb_vip_address: 10.100.102.102
-galera_client_drop_config_file: false
-galera_root_user: root
-galera_root_password: secrete
-internal_lb_vip_address: 10.100.102.102
-keystone_admin_tenant_name: admin
-keystone_admin_user_name: admin
-keystone_auth_admin_password: SuperSecretePassword
-keystone_container_mysql_password: "SuperSecrete"
-keystone_developer_mode: true
-keystone_galera_address: 10.100.102.101
-keystone_galera_database: keystone
-keystone_git_install_branch: master
-keystone_rabbitmq_password: "secrete"
-keystone_rabbitmq_port: "{{ rabbitmq_port }}"
-keystone_rabbitmq_servers: "{{ rabbitmq_servers }}"
-keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-keystone_rabbitmq_userid: keystone
-keystone_rabbitmq_vhost: /keystone
-keystone_requirements_git_install_branch: master
-keystone_service_adminuri: "http://{{ internal_lb_vip_address }}:35357"
-keystone_service_adminuri_insecure: false
-keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"
-keystone_service_internaluri: "http://{{ internal_lb_vip_address }}:5000"
-keystone_service_internaluri_insecure: false
-keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
-keystone_service_password: "secrete"
-keystone_service_region: RegionOne
-keystone_venv_tag: "testing"
-memcached_encryption_key: "secrete"
-memcached_servers: 127.0.0.1
 watcher_developer_mode: True
-watcher_galera_address: 10.100.102.101
+watcher_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
 watcher_galera_database: watcher
 watcher_galera_user: watcher
 watcher_galera_password: "secrete"
 watcher_rabbitmq_port: "{{ rabbitmq_port }}"
 watcher_rabbitmq_servers: "{{ rabbitmq_servers }}"
 watcher_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-watcher_rabbitmq_password: "secrete"
+watcher_rabbitmq_password: "{{ rabbitmq_password }}"
 watcher_rabbitmq_userid: watcher
 watcher_rabbitmq_vhost: /watcher
 watcher_requirements_git_install_branch: master
-watcher_service_adminurl: "http://{{ internal_lb_vip_address }}:9322"
+watcher_service_adminurl: "http://{{ hostvars[groups['watcher_api'][0]]['ansible_host'] }}:9322"
 watcher_service_password: "secrete"
 watcher_service_project_domain_id: default
 watcher_service_project_name: service
@ -66,10 +34,3 @@ watcher_service_user_domain_id: default
 watcher_service_user_name: watcher
 watcher_bin: "/openstack/venvs/watcher-{{ watcher_venv_tag }}/bin"
 watcher_venv_tag: "testing"
-openrc_os_auth_url: "http://127.0.0.1:5000/v3"
-openrc_os_domain_name: "Default"
-openrc_os_password: "{{ keystone_auth_admin_password }}"
-
-rabbitmq_port: 5672
-rabbitmq_servers: 10.100.102.101
-rabbitmq_use_ssl: False
--- a/tests/test.yml
+++ b/tests/test.yml
@ -13,20 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# Prepare the user ssh keys
- include: test-prepare-keys.yml
-
-# Prepare the host
- include: test-prepare-host.yml
-
-# Prepare the containers
- include: test-prepare-containers.yml
+# Setup the host
+- include: playbooks/test-setup-host.yml

 # Install RabbitMQ/MariaDB
- include: test-install-infra.yml
+- include: playbooks/test-install-infra.yml

-# Install keystone
- include: test-install-keystone.yml
+# Install Keystone
+- include: playbooks/test-install-keystone.yml

 # Install Watcher
 - include: test-install-watcher.yml
--- a/tox.ini
+++ b/tox.ini
@ -104,7 +104,7 @@ commands =
 [testenv:ansible]
 deps =
    {[testenv]deps}
-    ansible==1.9.4
+    ansible==2.1.1
    ansible-lint>=2.7.0,<3.0.0
 setenv =
    {[testenv]setenv}
@ -123,6 +123,7 @@ setenv =
    # This is required as the default is '/etc/ansible/roles' or a path
    # specified in ansible.cfg
    ANSIBLE_ROLES_PATH = {homedir}/.ansible/roles:{toxinidir}/..
+    ANSIBLE_TRANSPORT = "ssh"
 commands =
    rm -rf {homedir}/.ansible/plugins
    git clone https://git.openstack.org/openstack/openstack-ansible-plugins \
@ -131,7 +132,11 @@ commands =
    ansible-galaxy install \
                   --role-file={toxinidir}/tests/ansible-role-requirements.yml \
                   --force
-
+    rm -rf {homedir}/.ansible/roles/os_watcher
+    bash -c "ln -s {toxinidir} {homedir}/.ansible/roles/os_watcher"
+    rm -rf {toxinidir}/tests/playbooks
+    git clone https://git.openstack.org/openstack/openstack-ansible-tests \
+              {toxinidir}/tests/playbooks

 [testenv:ansible-syntax]
 deps =
@ -143,7 +148,6 @@ commands =
    ansible-playbook -i {toxinidir}/tests/inventory \
                     --syntax-check \
                     --list-tasks \
-                     -e "rolename={toxinidir}" \
                     {toxinidir}/tests/test.yml


@ -155,6 +159,22 @@ commands =
    ansible-lint {toxinidir}


+[testenv:func_base]
+# NOTE(odyssey4me): this target does not use constraints because
+# it doesn't work in OpenStack-CI yet. Once that's fixed, we can
+# drop the install_command.
+install_command =
+    pip install -U --force-reinstall {opts} {packages}
+
+
+[testenv:func_logs]
+commands =
+    bash -c 'mkdir -p {toxinidir}/logs'
+    bash -c 'rsync --archive --verbose --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true'
+    bash -c 'find "{toxinidir}/logs/" -type f | sed "p;s|$|.txt|" | xargs -n2 mv'
+    bash -c 'command gzip --best --recursive "{toxinidir}/logs/"'
+
+
 [testenv:functional]
 # Ignore_errors is set to true so that the logs are collected at the
 #  end of the run. This will not produce a false positive. Any
@ -165,7 +185,7 @@ ignore_errors = True
 # it doesn't work in OpenStack-CI yet. Once that's fixed, we can
 # drop the install_command.
 install_command =
-    pip install -U --force-reinstall {opts} {packages}
+    {[testenv:func_base]install_command}
 deps =
    {[testenv:ansible]deps}
 setenv =
@ -173,13 +193,9 @@ setenv =
 commands =
    {[testenv:ansible]commands}
    ansible-playbook -i {toxinidir}/tests/inventory \
-                     -e "rolename={toxinidir}" \
                     -e "install_test_packages=True" \
                     {toxinidir}/tests/test.yml -vvvv
-    bash -c 'mkdir -p {toxinidir}/logs'
-    bash -c 'rsync --archive --verbose --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true'
-    bash -c 'find "{toxinidir}/logs/" -type f | sed "p;s|$|.txt|" | xargs -n2 mv'
-    bash -c 'command gzip --best --recursive "{toxinidir}/logs/"'
+    {[testenv:func_logs]commands}


 [testenv:linters]