From 5282c8650cf64f9ac418f8d4e0315dfa3cb3da39 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 25 May 2018 15:54:08 -0400 Subject: Remove pacmeaker workaround There was a compatibility issue with the centos 7.4/7.5 between the host pacemaker version and container. Now that containers have moved to 7.5 we should not need this workaround anymore. Change-Id: I9632c65e87687d4f36130719c6df9af2e913eed8 Signed-off-by: Tim Rozet --- lib/ansible/playbooks/deploy_overcloud.yml | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'lib/ansible') diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml index 18ddab48..90c237be 100644 --- a/lib/ansible/playbooks/deploy_overcloud.yml +++ b/lib/ansible/playbooks/deploy_overcloud.yml @@ -41,33 +41,6 @@ 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 -- cgit 1.2.3-korg