From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Wed, 2 May 2018 12:34:38 -0400
Subject: Migrates master to use direct upstream

We now move master to deploy from upstream.  That means we do not need
to build undercloud/overcloud images anymore.

Changes-Include:
 - Remove bash build scripts as we do not need to build anything
   other than the python package anymore
 - Remove building images or iso from build.py
 - Remove building of images and iso from Makefile
 - Rename/refactor deploy settings files for nosdn and odl.  The new
   convention is that the typical scenario names we use will deploy
   master.  We also support n-1 OS, so in that case we use the branch
   name for the "feature" in the scenario name: os-odl-queens-noha.
 - Tacker/Congress are disabled in settings files until we fix that with
   upstream.  Containers are now enabled by default.
 - Disable TLS for undercloud (was changed upstream to default enabled)
 - Fix environments docker directory for master THT (was changed upstream)
 - Includes fix for LP#1768901
 - Includes workaround for LP#1770692
 - Moves to docker.io for container images as it is more stable and
   should contain the same images
 - Removes the term 'common' from apex packaging for referencing the
   Python Apex package

Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 lib/ansible/playbooks/deploy_overcloud.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'lib/ansible/playbooks/deploy_overcloud.yml')

diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 268a5173..18ddab48 100644
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -41,6 +41,33 @@
         state: restarted
         enabled: yes
       become: yes
+    - name: Workaround to downgrade pacemaker (LP#1770692)
+      block:
+        - name: Pull haproxy container
+          shell: docker pull {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-haproxy:current-tripleo-rdo
+        - name: Find container pacemaker version
+          shell: docker run {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-haproxy:current-tripleo-rdo /bin/rpm -q pacemaker
+          register: pcs_version
+        - name: Create centos74 repo (contains older pacemaker)
+          copy:
+            dest: /tmp/centos74.repo
+            content: |
+              [centos74-updates]
+              name=CentOS-74 - Updates
+              baseurl=http://mirror.centos.org/centos/7.4.1708/updates/$basearch/
+              gpgcheck=1
+              gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+              enabled=1
+            mode: 0644
+        - name: Install container pacemaker version to overcloud image
+          shell: >
+            LIBGUESTFS_BACKEND=direct virt-customize -a /home/stack/overcloud-full.qcow2
+            --upload /tmp/centos74.repo:/etc/yum.repos.d/
+            --run-command "yum remove -y pacemaker-cluster-libs pacemaker-libs pacemaker pacemaker-cli"
+            --run-command "yum install -y {{ pcs_version.stdout }}" -v
+            --install "pcs"
+      become: yes
+      when: ha_enabled
     - name: Remove Ceph OSD from ceph storage role
       lineinfile:
         path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml
@@ -81,9 +108,12 @@
     - block:
         - name: Execute Overcloud Deployment
           shell: "{{ stackrc }} && bash deploy_command"
+
       rescue:
         - name: Show overcloud failures
           shell: "{{ stackrc }} && openstack stack failures list overcloud --long"
+      become: yes
+      become_user: stack
     - name: Show Keystone output
       shell: "{{ overcloudrc }} && {{ item }}"
       when: debug
-- 
cgit 1.2.3-korg