From c77a8dee8fcc266c147f999e2ded1771ecf1cdb5 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 26 Feb 2019 12:44:39 -0500
Subject: [PATCH] Bootstrap nodes using windmill-ops

Change-Id: I1078056dcf30529da8da86217417dae84428ee3b
Depends-On: https://review.openstack.org/639109
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .zuul.d/jobs.yaml        |  1 +
 playbooks/bootstrap.yaml | 32 --------------------------------
 playbooks/site.yaml      |  1 -
 tests/playbooks/run.yaml |  5 +++++
 tools/requirements.yaml  |  3 ---
 5 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 playbooks/bootstrap.yaml

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 1510407..32a2126 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -20,6 +20,7 @@
       - openstack/diskimage-builder
       - openstack/openstacksdk
       - openstack/windmill
+      - openstack/windmill-ops
       - openstack-infra/gear
       - openstack-infra/nodepool
       - openstack-infra/zuul
diff --git a/playbooks/bootstrap.yaml b/playbooks/bootstrap.yaml
deleted file mode 100644
index b17fea5..0000000
--- a/playbooks/bootstrap.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2016 Red Hat, 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: Bootstrap nodes
-  hosts: all:!bastion:!disabled
-
-  pre_tasks:
-    - name: Update apt cache
-      become: true
-      apt:
-        update_cache: true
-        upgrade: dist
-      when: ansible_os_family == 'Debian'
-
-- name: Bootstrap python dependencies for windmill
-  hosts: all:!bastion:!zookeeper:!disabled
-
-  tasks:
-    - name: Setup openstack.virtualenv role
-      include_role:
-        name: openstack.virtualenv
diff --git a/playbooks/site.yaml b/playbooks/site.yaml
index 5bb4b6f..3fcba7e 100644
--- a/playbooks/site.yaml
+++ b/playbooks/site.yaml
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- import_playbook: bootstrap.yaml
 - import_playbook: statsd.yaml
 - import_playbook: gear.yaml
 - import_playbook: zookeeper.yaml
diff --git a/tests/playbooks/run.yaml b/tests/playbooks/run.yaml
index 8504b4d..a896c99 100644
--- a/tests/playbooks/run.yaml
+++ b/tests/playbooks/run.yaml
@@ -6,6 +6,11 @@
         chdir: "{{ windmill_src_dir }}"
       shell: tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/bastion.yaml
 
+    - name: Bootstrap all nodes using windmill-ops
+      args:
+        chdir: "{{ zuul.projects['git.openstack.org/openstack/windmill-ops'].src_dir }}"
+      shell: "tox -evenv -- ansible-playbook -i {{ windmill_src_dir }}/inventory/testing/hosts playbooks/bootstrap/site.yaml"
+
     - name: Run ansible-playbook for site.yaml
       args:
         chdir: "{{ windmill_src_dir }}"
diff --git a/tools/requirements.yaml b/tools/requirements.yaml
index 9632cb6..e8fa527 100644
--- a/tools/requirements.yaml
+++ b/tools/requirements.yaml
@@ -26,9 +26,6 @@
 - name: openstack.sudoers
   src: git+https://git.openstack.org/openstack/ansible-role-sudoers
 
-- name: openstack.virtualenv
-  src: git+https://git.openstack.org/openstack/ansible-role-virtualenv
-
 - name: openstack.zookeeper
   src: git+https://git.openstack.org/openstack/ansible-role-zookeeper