From 4921521677171459ea15fc9f531b8cf0b50fe305 Mon Sep 17 00:00:00 2001
From: Marc Gariepy <gariepy.marc@gmail.com>
Date: Thu, 26 Jan 2017 12:34:48 -0500
Subject: [PATCH] standardize test for os_designate

standardize test based on other roles.

Change-Id: I3cec90ad07f1a1c64177fb3a27d97a6d0bb47f46
---
 tests/group_vars/all_containers.yml |  4 +-
 tests/inventory                     |  6 +--
 tests/test-install-designate.yml    | 73 ++++-------------------------
 3 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 83ce021..f37df47 100644
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@@ -17,9 +17,9 @@ container_name: "{{ inventory_hostname }}"
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
-    bridge: "lxcbr0"
+    bridge: "br-mgmt"
     interface: "eth1"
-    netmask: "255.255.252.0"
+    netmask: "255.255.255.0"
     type: "veth"
 physical_host: localhost
 properties:
diff --git a/tests/inventory b/tests/inventory
index 94420ac..ee466b7 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,7 +1,7 @@
 [all]
 localhost ansible_become=True
-infra1 ansible_host=10.100.100.101 ansible_become=True
-openstack1 ansible_host=10.100.100.102 ansible_become=True
+infra1 ansible_host=10.1.0.2 ansible_become=True
+openstack1 ansible_host=10.1.0.3 ansible_become=True
 
 [hosts]
 localhost
@@ -54,4 +54,4 @@ infra1
 infra1
 
 [memcached_all]
-infra1
\ No newline at end of file
+infra1
diff --git a/tests/test-install-designate.yml b/tests/test-install-designate.yml
index fc26ead..12d8f3a 100644
--- a/tests/test-install-designate.yml
+++ b/tests/test-install-designate.yml
@@ -18,69 +18,16 @@
   user: root
   gather_facts: true
   pre_tasks:
-    - name: Ensure rabbitmq vhost
-      rabbitmq_vhost:
-        name: "{{ designate_rabbitmq_vhost }}"
-        state: "present"
-      delegate_to: "{{ hostvars[groups['rabbitmq_all'][0]]['ansible_host'] }}"
-      when: inventory_hostname == groups['designate_all'][0]
-    - name: Ensure rabbitmq user
-      rabbitmq_user:
-        user: "{{ designate_rabbitmq_userid }}"
-        password: "{{ designate_rabbitmq_password }}"
-        vhost: "{{ designate_rabbitmq_vhost }}"
-        configure_priv: ".*"
-        read_priv: ".*"
-        write_priv: ".*"
-        state: "present"
-      delegate_to: "{{ hostvars[groups['rabbitmq_all'][0]]['ansible_host'] }}"
-      when: inventory_hostname == groups['designate_all'][0]
-    - name: Create DB for service
-      mysql_db:
-        login_user: "{{ galera_root_user }}"
-        login_password: "{{ galera_root_password }}"
-        login_host: "localhost"
-        name: "{{ designate_galera_database }}"
-        state: "present"
-      delegate_to: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
-      when: inventory_hostname == groups['designate_all'][0]
-    - name: Grant access to the DB for the service
-      mysql_user:
-        login_user: "{{ galera_root_user }}"
-        login_password: "{{ galera_root_password }}"
-        login_host: "localhost"
-        name: "{{ designate_galera_user }}"
-        password: "{{ designate_galera_password }}"
-        host: "{{ item }}"
-        state: "present"
-        priv: "{{ designate_galera_database }}.*:ALL"
-      with_items:
-        - "localhost"
-        - "%"
-      delegate_to: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
-      when: inventory_hostname == groups['designate_all'][0]
-    - name: Create pool_manager DB for service
-      mysql_db:
-        login_user: "{{ galera_root_user }}"
-        login_password: "{{ galera_root_password }}"
-        login_host: "{{ designate_galera_address }}"
-        name: "{{ designate_pool_manager_galera_database }}"
-        state: "present"
-      delegate_to: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
-    - name: Grant access to the pool_manager DB for the service
-      mysql_user:
-        login_user: "{{ galera_root_user }}"
-        login_password: "{{ galera_root_password }}"
-        login_host: "{{ designate_galera_address }}"
-        name: "{{ designate_pool_manager_galera_user }}"
-        password: "{{ designate_pool_manager_galera_password }}"
-        host: "{{ item }}"
-        state: "present"
-        priv: "{{ designate_pool_manager_galera_database }}.*:ALL"
-      with_items:
-        - "localhost"
-        - "%"
-      delegate_to: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
+    - include: common/ensure-rabbitmq.yml
+      vhost_name: "{{ designate_rabbitmq_vhost }}"
+      user_name: "{{ designate_rabbitmq_userid }}"
+      user_password: "{{ designate_rabbitmq_password }}"
+    - include: common/create-grant-db.yml
+      db_name: "{{ designate_galera_user }}"
+      db_password: "{{ designate_galera_password }}"
+    - include: common/create-grant-db.yml
+      db_name: "{{ designate_pool_manager_galera_database }}"
+      db_password: "{{ designate_pool_manager_galera_password }}"
     - name: Install bind9
       apt:
         package: bind9