From 40c29df6796e6d055f35b730e70dac87ab7db2d4 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Sat, 22 Apr 2017 12:49:21 +0800
Subject: Organize **all** tasks into ansible role `qtip`

Change-Id: I5d3852d2a31e9c4043191377e5cb7d539d222a8c
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 .../qtip-workspace/files/defaults/setup.yml        | 43 +++-------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

(limited to 'resources/ansible_roles/qtip-workspace/files/defaults/setup.yml')

diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
index 5b4677e9..a522d67b 100644
--- a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
@@ -8,43 +8,10 @@
 ##############################################################################
 
 # Prepare connection to SUT (System Under Test)
-- hosts: fuel-masters
-  gather_facts: no
-  tasks:
-  - name: collect facts of fuel hosts
-    fuel:
-
-- hosts: apex-underclouds
-  gather_facts: no
 
-  tasks:
-  - name: collect overcloud baremetal info
-    shell: . /root/stackrc && openstack baremetal list --fields instance_uuid properties provision_state --format json
-    register: baremetal_info
-  - name: collect overcloud server info
-    shell: . /root/stackrc && openstack server list --format json
-    register: server_info
-  - name: generate inventory
-    apex_generate_inventory:
-      baremetal_info: "{{ baremetal_info.stdout | from_json }}"
-      server_info: "{{ server_info.stdout | from_json }}"
+---
 
-- hosts:
-  - fuel-masters
-  - apex-underclouds
-  tasks:
-  - name: update inventory file
-    template: src=templates/hosts dest=./hosts
-    delegate_to: localhost
-  - name: update ssh.cfg file
-    template: src=templates/ssh.cfg dest=./ssh.cfg
-    delegate_to: localhost
-
-- hosts: localhost
-  tasks:
-  - name: create cache directory
-    file:
-      path: "{{ item }}"
-      state: directory
-    with_items:
-      - "{{ qtip_cache }}"
+- hosts: [fuel-masters, apex-underclouds]
+  gather_facts: no
+  roles:
+    - { role: qtip, tasks: generate-inventory }
-- 
cgit 1.2.3-korg