From 49f4aea85e8792070a2be6cbaf6a2668736cb422 Mon Sep 17 00:00:00 2001
From: Jose Luis Franco Arza <jfrancoa@redhat.com>
Date: Fri, 16 Mar 2018 15:39:27 +0100
Subject: [PATCH] Add undercloud upgrades playbook.

This new playbook configures repositories
in the undercloud before upgrade, imports
the needed branch of tripleo-upgrade role
and executes the role.

Change-Id: I7e8cc0c590ba1ec3a21a9a7545ac3318929387c2
---
 playbooks/multinode-overcloud-upgrade-new.yml |  2 +-
 playbooks/multinode-undercloud-upgrade.yml    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/multinode-undercloud-upgrade.yml

diff --git a/playbooks/multinode-overcloud-upgrade-new.yml b/playbooks/multinode-overcloud-upgrade-new.yml
index c93a298e5..1269f0ae0 100644
--- a/playbooks/multinode-overcloud-upgrade-new.yml
+++ b/playbooks/multinode-overcloud-upgrade-new.yml
@@ -85,4 +85,4 @@
         upgrade_init_command: "{{ update_repo_script_content }}"
       include_role:
         name: tripleo-upgrade
-      when: containerized_overcloud_upgrade|bool or undercloud_upgrade|default(false)|bool
+      when: containerized_overcloud_upgrade|bool
diff --git a/playbooks/multinode-undercloud-upgrade.yml b/playbooks/multinode-undercloud-upgrade.yml
new file mode 100644
index 000000000..97625eb6f
--- /dev/null
+++ b/playbooks/multinode-undercloud-upgrade.yml
@@ -0,0 +1,20 @@
+- name: Configure next release repository in the undercloud
+  hosts: undercloud
+  tags:
+    - undercloud-upgrade
+  vars:
+    repo_setup_script: "repo-setup-{{ lookup('env', 'UPGRADE_RELEASE') }}.sh"
+    repo_setup_log: "repo-setup-{{ lookup('env', 'UPGRADE_RELEASE') }}.log"
+    repo_setup_run_update: false
+    dlrn_hash_path: ''
+    dlrn_hash_path_newest: ''
+  roles:
+    - role: repo-setup
+
+- name: Run tripleo-upgrade role to upgrade undercloud
+  hosts: undercloud
+  tags:
+    - undercloud-upgrade
+  roles:
+    - role: tripleo-upgrade
+