Reorganize test playbooks

The following changes have been made to reorganize the structure of this
role's test playbooks, bringing them into line with other
OpenStack-Ansible roles:
  - move each playbook to an individual file
  - rename playbooks descriptively
  - define hosts and groups directly in the inventory file
  - include group vars required by containers
  - store extra variables in a single shared test-vars file
  - reduce lxc network dhcp network range to avoid conflicts with static
    container addresses
  - include callback plugin for human readable logging of test tasks

Change-Id: I6aa877b10945a265d7484c9aacb3c232d82d8ebb

tests/group_vars/all_containers.yml

@@ -0,0 +1,27 @@
+---
+# 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.
+# 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.
+
+
+container_name: "{{ inventory_hostname }}"
+container_networks:
+  management_address:
+    address: "{{ ansible_host }}"
+    bridge: "lxcbr0"
+    interface: "eth1"
+    netmask: "255.255.252.0"
+    type: "veth"
+physical_host: localhost
+properties:
+  service_name: "{{ inventory_hostname }}"

tests/inventory

@@ -1,2 +1,13 @@
 [all]
 localhost ansible_connection=local ansible_become=True
+container1 ansible_ssh_host=10.100.100.101 ansible_host=10.100.100.101 ansible_become=True ansible_user=root
+container2 ansible_ssh_host=10.100.100.102 ansible_host=10.100.100.102 ansible_become=True ansible_user=root
+container3 ansible_ssh_host=10.100.100.103 ansible_host=10.100.100.103 ansible_become=True ansible_user=root
+
+[rabbitmq_all]
+container1
+container2
+container3
+
+[all_containers:children]
+rabbitmq_all

tests/test-install-rabbitmq-server.yml

@@ -0,0 +1,26 @@
+---
+# 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.
+# 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: Install RabbitMQ server
+  hosts: rabbitmq_all
+  user: root
+  gather_facts: true
+  roles:
+    - role: "{{ rolename | basename }}"
+      rabbitmq_cookie_token: secrete
+  post_tasks:
+    - include: test-functional.yml
+  vars_files:
+    - test-vars.yml

tests/test-prepare-host.yml

@@ -1,5 +1,6 @@
+
 ---
-# 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,34 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Create ssh key pairs for use with containers
-  hosts: 127.0.0.1
-  connection: local
-  become: false
-  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 users key
-      command: cat ~/.ssh/id_rsa.pub
-      register: key_get
-    - set_fact:
-        lxc_container_ssh_key: "{{ key_get.stdout }}"
-
 - name: Perform basic LXC host setup
   hosts: localhost
-  connection: local
   pre_tasks:
+    - name: Ensure apt cache is always refreshed
+      apt:
+        update_cache: yes
     - name: Ensure root's new public ssh key is in authorized_keys
       authorized_key:
         user: root
-        key: "{{ hostvars['127.0.0.1']['lxc_container_ssh_key'] }}"
+        key: "{{ hostvars['localhost']['lxc_container_ssh_key'] }}"
         manage_dir: no
     - set_fact:
-        lxc_container_ssh_key: "{{ hostvars['127.0.0.1']['lxc_container_ssh_key'] }}"
+        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
@@ -62,7 +48,7 @@
   roles:
     - role: "lxc_hosts"
       lxc_net_address: 10.100.100.1
-      lxc_net_dhcp_range: 10.100.100.2,10.100.100.253
+      lxc_net_dhcp_range: 10.100.100.2,10.100.100.100
       lxc_net_bridge: lxcbr0
       lxc_kernel_options:
         - { key: 'fs.inotify.max_user_instances', value: 1024 }
@@ -71,29 +57,3 @@
           name: "trusty.tgz"
           sha256sum: "56c6a6e132ea7d10be2f3e8104f47136ccf408b30e362133f0dc4a0a9adb4d0c"
           chroot_path: trusty/rootfs-amd64
-  post_tasks:
-    # Inventory is being pre-loaded using a post tasks instead of through a dynamic
-    #  inventory system. While this is not a usual method for deployment it's being
-    #  done for functional testing.
-    - name: Create container hosts
-      add_host:
-        groups: "all,all_containers,rabbitmq_all"
-        hostname: "{{ item.name }}"
-        inventory_hostname: "{{ item.name }}"
-        ansible_ssh_host: "{{ item.address }}"
-        ansible_become: true
-        properties:
-          service_name: "{{ item.service }}"
-        container_networks:
-          management_address:
-            address: "{{ item.address }}"
-            bridge: "lxcbr0"
-            interface: "eth1"
-            netmask: "255.255.252.0"
-            type: "veth"
-        physical_host: localhost
-        container_name: "{{ item.name }}"
-      with_items:
-        - { name: "container1", service: "service1", address: "10.100.100.101" }
-        - { name: "container2", service: "service2", address: "10.100.100.102" }
-        - { name: "container3", service: "service3", address: "10.100.100.103" }

tests/test-prepare-keys.yml

@@ -0,0 +1,33 @@
+---
+# 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.
+# 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: Create ssh key pairs for use with containers
+  hosts: localhost
+  become_user: "{{ ansible_ssh_user }}"
+  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 users key
+      command: cat ~/.ssh/id_rsa.pub
+      register: key_get
+    - set_fact:
+        lxc_container_ssh_key: "{{ key_get.stdout }}"

tests/test-vars.yml

@@ -0,0 +1 @@
+rabbitmq_cookie_token: secrete

tests/test.yml

@@ -13,22 +13,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Run basic prep
-- include: test-prep.yml
+# Prepare the user ssh keys
+- include: test-prepare-keys.yml
+
+# Prepare the host
+- include: test-prepare-host.yml
 
 # Run container clean up and build
-- include: test-container-create.yml
+- include: test-prepare-containers.yml
 
-# Deploy the environment
-- name: Install role default rabbitmq version
-  hosts: rabbitmq_all
-  user: root
-  gather_facts: true
-  roles:
-    - role: "{{ rolename | basename }}"
-      rabbitmq_cookie_token: secrete
-  post_tasks:
-    - include: test-functional.yml
+# Install RabbitMQ server
+- include: test-install-rabbitmq-server.yml
 
-# Perform upgrade testing
-- include: test-upgrade.yml
+############################# UPGRADE TESTING #############################
+
+# Run container clean up and build
+- include: test-prepare-containers.yml
+
+# Install previous version of RabbitMQ server
+- include: test-install-rabbitmq-server.yml
+  vars:
+    rabbitmq_package_url: "https://www.rabbitmq.com/releases/rabbitmq-server/v3.5.7/rabbitmq-server_3.5.7-1_all.deb"
+    rabbitmq_package_version: "{{ rabbitmq_package_url.split('/')[-1].split('_')[1] }}"
+    rabbitmq_package_sha256: "b8a42321c2f2689dc579911fbb583bd9c4d2ce2f20003d7050d5a324a6d2de42"
+
+# Perform upgrade of RabbitMQ server
+- include: test-install-rabbitmq-server.yml
+  vars:
+    rabbitmq_upgrade: true

tox.ini

@@ -15,6 +15,7 @@ whitelist_externals =
     bash
     git
     rm
+    wget
 setenv =
     VIRTUAL_ENV={envdir}
     ANSIBLE_HOST_KEY_CHECKING = False
@@ -108,12 +109,16 @@ commands =
     rm -rf {homedir}/.ansible
     git clone https://git.openstack.org/openstack/openstack-ansible-plugins \
               {homedir}/.ansible/plugins
+    # This plugin makes the ansible-playbook output easier to read
+    wget -O {homedir}/.ansible/plugins/callback/human_log.py \
+      https://gist.githubusercontent.com/cliffano/9868180/raw/f360f306b3c6d689734a6aa8773a00edf16a0054/human_log.py
     ansible-galaxy install \
                    --role-file={toxinidir}/tests/ansible-role-requirements.yml \
                    --ignore-errors \
                    --force
     ansible-playbook -i {toxinidir}/tests/inventory \
                      -e "rolename={toxinidir}" \
+                     -vv \
                      {toxinidir}/tests/test.yml