From 6033bb1680f1e2d98cfeefb22010e6ecf49f2c40 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Fri, 9 Mar 2018 09:51:52 +0000
Subject: xci: Rename provision-vm-nodes playbook

The provision-vm-nodes playbook doesn't do any VM provisioning. It
basically just bootstraps the bifrost repository so rename it to
make it clear what this is about.

Change-Id: I1c10bc6135686c5197d553a885412a94312a41bc
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
 xci/playbooks/bootstrap-bifrost.yml  | 42 ++++++++++++++++++++++++++++++++++++
 xci/playbooks/provision-vm-nodes.yml | 42 ------------------------------------
 xci/xci-deploy.sh                    |  2 +-
 3 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 xci/playbooks/bootstrap-bifrost.yml
 delete mode 100644 xci/playbooks/provision-vm-nodes.yml

diff --git a/xci/playbooks/bootstrap-bifrost.yml b/xci/playbooks/bootstrap-bifrost.yml
new file mode 100644
index 00000000..8b8bb30d
--- /dev/null
+++ b/xci/playbooks/bootstrap-bifrost.yml
@@ -0,0 +1,42 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2017 Ericsson AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+- hosts: localhost
+  connection: local
+  gather_facts: true
+  vars_files:
+    - ../var/opnfv.yml
+  pre_tasks:
+    - name: Load distribution variables
+      include_vars:
+        file: ../var/{{ ansible_os_family }}.yml
+  roles:
+    - role: clone-repository
+      project: "opnfv/bifrost"
+      repo: "{{ OPENSTACK_BIFROST_GIT_URL }}"
+      dest: "{{ XCI_CACHE }}/repos/bifrost"
+      version: "{{ OPENSTACK_BIFROST_VERSION }}"
+
+  tasks:
+    - name: Load distribution variables
+      include_vars:
+        file: ../var/{{ ansible_os_family }}.yml
+    - name: Synchronize local development bifrost repository to XCI paths
+      # command module is much faster than the copy module
+      synchronize:
+        src: "{{ OPENSTACK_BIFROST_DEV_PATH }}"
+        dest: "{{ XCI_CACHE }}/repos/bifrost"
+        recursive: yes
+        delete: yes
+      when:
+        - OPENSTACK_BIFROST_DEV_PATH != ""
+    - name: combine opnfv/releng-xci and openstack/bifrost scripts/playbooks
+      copy:
+        src: "{{ XCI_PATH}}/bifrost/"
+        dest: "{{ XCI_CACHE }}/repos/bifrost"
diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml
deleted file mode 100644
index 8b8bb30d..00000000
--- a/xci/playbooks/provision-vm-nodes.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2017 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-- hosts: localhost
-  connection: local
-  gather_facts: true
-  vars_files:
-    - ../var/opnfv.yml
-  pre_tasks:
-    - name: Load distribution variables
-      include_vars:
-        file: ../var/{{ ansible_os_family }}.yml
-  roles:
-    - role: clone-repository
-      project: "opnfv/bifrost"
-      repo: "{{ OPENSTACK_BIFROST_GIT_URL }}"
-      dest: "{{ XCI_CACHE }}/repos/bifrost"
-      version: "{{ OPENSTACK_BIFROST_VERSION }}"
-
-  tasks:
-    - name: Load distribution variables
-      include_vars:
-        file: ../var/{{ ansible_os_family }}.yml
-    - name: Synchronize local development bifrost repository to XCI paths
-      # command module is much faster than the copy module
-      synchronize:
-        src: "{{ OPENSTACK_BIFROST_DEV_PATH }}"
-        dest: "{{ XCI_CACHE }}/repos/bifrost"
-        recursive: yes
-        delete: yes
-      when:
-        - OPENSTACK_BIFROST_DEV_PATH != ""
-    - name: combine opnfv/releng-xci and openstack/bifrost scripts/playbooks
-      copy:
-        src: "{{ XCI_PATH}}/bifrost/"
-        dest: "{{ XCI_CACHE }}/repos/bifrost"
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 1eeaf3b2..ff73a56b 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -156,7 +156,7 @@ sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers
 cd $XCI_PATH/bifrost/
 sudo -E bash ./scripts/destroy-env.sh
 cd $XCI_PLAYBOOKS
-ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory provision-vm-nodes.yml
+ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory bootstrap-bifrost.yml
 cd ${XCI_CACHE}/repos/bifrost
 bash ./scripts/bifrost-provision.sh
 echo "-----------------------------------------------------------------------"
-- 
cgit 1.2.3-korg