From f926a74c61929fb10a93971eadfa26058d93299b Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Thu, 17 Mar 2016 10:03:15 +0000
Subject: [PATCH] Role cleanup

This commit does the following:

- updates README.rst by adding some required vars and removing some
  references to glance
- pips ansible-lint as is done in the other roles
- updates tests/test-prepare-host.yml to install specified packages
  outside of tox's venv

Change-Id: I80f36b1e5584895681b6c51f5b1e329794b4c92a
---
 README.rst                  | 8 +++++---
 test-requirements.txt       | 2 +-
 tests/test-prepare-host.yml | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 49d273a..28b9abf 100644
--- a/README.rst
+++ b/README.rst
@@ -11,8 +11,6 @@ This role will install the following Upstart services:
     * designate-pool-manager
     * designate-mdns
     * designate-sink
-    * glance-api
-    * glance-registry
 
 Default Variables
 =================
@@ -28,7 +26,9 @@ Required Variables
 
     designate_galera_address
     designate_container_mysql_password
+    designate_pool_manager_container_mysql_password
     designate_service_password
+    designate_rabbitmq_password
 
 Example Playbook
 ================
@@ -45,5 +45,7 @@ Example Playbook
         internal_lb_vip_address: 192.168.0.1
         designate_galera_address: "{{ internal_lb_vip_address }}"
         designate_container_mysql_password: "SuperSecretePassword1"
-        designate_service_password: "SuperSecretePassword2"
+        designate_pool_manager_container_mysql_password: "SuperSecretePassword2"
+        designate_service_password: "SuperSecretePassword3"
+        designate_rabbitmq_password: "SuperSecretePassword4"
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 8ebdd06..3422d65 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-ansible-lint
+ansible-lint<=2.3.9
 ansible>=1.9.1,<2.0.0
 bashate
 flake8
diff --git a/tests/test-prepare-host.yml b/tests/test-prepare-host.yml
index 6943797..dcb36e7 100644
--- a/tests/test-prepare-host.yml
+++ b/tests/test-prepare-host.yml
@@ -44,11 +44,11 @@
           chroot_path: trusty/rootfs-amd64
     - role: "openstack_openrc"
   post_tasks:
+    # In the gate these packages get installed into .tox/functional, which is
+    # not where we need them to be.  If we can figure out how to override this
+    # we can revert to using the pip module instead.
     - name: Install pip packages
-      pip:
-        name: "{{ item }}"
-        state: present
-        extra_args: "{{ pip_install_options|default('') }}"
+      command: /usr/local/bin/pip install {{ item }}
       register: install_packages
       until: install_packages|success
       retries: 5