summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-05-29 13:10:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-29 13:10:59 +0000
commit23fc66e5bce6fe634d6e99cfa89d0424a47e66a1 (patch)
tree4d42c1a2ca54c712a37006f35606d81cfe4be467 /lib
parent742f9d16ab751c2d0398c2d332374cffcf6822ff (diff)
parent5282c8650cf64f9ac418f8d4e0315dfa3cb3da39 (diff)
Merge "Remove pacmeaker workaround"
Diffstat (limited to 'lib')
-rw-r--r--lib/ansible/playbooks/deploy_overcloud.yml27
1 files changed, 0 insertions, 27 deletions
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