From 7c2883814a72777f063e0574dc01b420528ce237 Mon Sep 17 00:00:00 2001
From: Raoul Scarazzini <rscarazz@redhat.com>
Date: Mon, 12 Jun 2017 10:58:06 -0400
Subject: [PATCH] Restore tags inside the main playbook

This modification reintroduces the tags for all the task inside the main
playbooks quickstart-extras-*.yml.
This is related to the tags topic [1] and is meant for developers who
wants to have atomic access to each step of the deployment.

[1] https://bugs.launchpad.net/tripleo/+bug/1657415

Change-Id: Icd645ee9003bafb8988a6430280ab4b7ad5ff34f
---
 playbooks/quickstart-extras-overcloud-prep.yml       | 12 ++++++++++++
 playbooks/quickstart-extras-overcloud.yml            |  2 ++
 playbooks/quickstart-extras-undercloud.yml           |  6 ++++++
 ...estore-tags-extras-playbook-3fdc668612708931.yaml |  8 ++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 releasenotes/notes/restore-tags-extras-playbook-3fdc668612708931.yaml

diff --git a/playbooks/quickstart-extras-overcloud-prep.yml b/playbooks/quickstart-extras-overcloud-prep.yml
index a36714aca..557c863fb 100644
--- a/playbooks/quickstart-extras-overcloud-prep.yml
+++ b/playbooks/quickstart-extras-overcloud-prep.yml
@@ -2,6 +2,8 @@
 - name:  Prepare configuration files for the overcloud deployment
   hosts: undercloud
   gather_facts: no
+  tags:
+    - overcloud-prep-config
   roles:
     - overcloud-prep-config
 
@@ -9,6 +11,8 @@
 - name:  Prepare overcloud containers
   hosts: undercloud
   gather_facts: no
+  tags:
+    - overcloud-prep-containers
   roles:
     - overcloud-prep-containers
 
@@ -16,6 +20,8 @@
 - name:  Prepare the overcloud images for deployment
   hosts: undercloud
   gather_facts: no
+  tags:
+    - overcloud-prep-images
   roles:
     - overcloud-prep-images
 
@@ -34,6 +40,8 @@
 - name:  Prepare overcloud flavors
   hosts: undercloud
   gather_facts: no
+  tags:
+    - overcloud-prep-flavors
   roles:
     - overcloud-prep-flavors
 
@@ -41,6 +49,8 @@
 - name:  Prepare the undercloud networks for the overcloud deployment
   hosts: undercloud
   gather_facts: no
+  tags:
+    - overcloud-prep-network
   roles:
     - overcloud-prep-network
 
@@ -58,5 +68,7 @@
 - name: Prepare the SSL Configuration for the overcloud deployment
   hosts: undercloud
   gather_facts: no
+  tags:
+    - overcloud-ssl
   roles:
     - { role: overcloud-ssl }
diff --git a/playbooks/quickstart-extras-overcloud.yml b/playbooks/quickstart-extras-overcloud.yml
index 5eb130be8..24144c1a0 100644
--- a/playbooks/quickstart-extras-overcloud.yml
+++ b/playbooks/quickstart-extras-overcloud.yml
@@ -12,6 +12,7 @@
   gather_facts: yes
   tags:
     - overcloud-deploy
+    - overcloud-inventory
   vars:
       inventory: all
   roles:
@@ -33,6 +34,7 @@
   hosts: localhost
   tags:
     - overcloud-deploy
+    - overcloud-check
   tasks:
     - name: ensure the deployment result has been read into memory
       include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
diff --git a/playbooks/quickstart-extras-undercloud.yml b/playbooks/quickstart-extras-undercloud.yml
index fcda3b8d3..9e061018c 100644
--- a/playbooks/quickstart-extras-undercloud.yml
+++ b/playbooks/quickstart-extras-undercloud.yml
@@ -2,6 +2,8 @@
 - name: Deploy the FreeIPA server
   hosts: supplemental
   gather_facts: no
+  tags:
+    - freeipa-setup
   roles:
     - { role: freeipa-setup, when: deploy_supplemental_node|bool and enable_tls_everywhere|bool }
 
@@ -11,6 +13,8 @@
   gather_facts: no
   vars:
     ansible_user: root
+  tags:
+    - undercloud-setup
   roles:
     - { role: undercloud-setup, when: undercloud_setup|bool }
 
@@ -18,6 +22,8 @@
 - name:  Deploy the undercloud
   hosts: undercloud
   gather_facts: no
+  tags:
+    - undercloud-deploy
   roles:
     - undercloud-deploy
 
diff --git a/releasenotes/notes/restore-tags-extras-playbook-3fdc668612708931.yaml b/releasenotes/notes/restore-tags-extras-playbook-3fdc668612708931.yaml
new file mode 100644
index 000000000..4f0ea9235
--- /dev/null
+++ b/releasenotes/notes/restore-tags-extras-playbook-3fdc668612708931.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Tags were added in all the playbooks so that it is possible to control
+    atomically the flow of the entire process.
+    For details about how to use tags check the chapter *Using tags to
+    atomically execute specific phases of the deployment* in
+    [TripleO Quickstart - Getting Started Guide](https://docs.openstack.org/tripleo-quickstart/latest/getting-started.html)