Merge "Default ctlplane to native VLAN"

diff --git a/INFO b/INFO
index 57aa632..c2d56ae 100644 (file)
--- a/INFO
+++ b/INFO
@@ -24,5 +24,6 @@ Dan Radez (dradez@redhat.com)
 Tim Rozet (trozet@redhat.com)
 Michael Chapman (michapma@redhat.com)
 Feng Pan (fpan@redhat.com)
+Ricardo Noriega (rnoriega@redhat.com)
 
 Link to TSC approval of the project: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html

diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index fafc82f..a718061 100644 (file)
--- a/build/rpm_specs/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
@@ -18,6 +18,7 @@ Requires:       ipxe-roms-qemu >= 20160127-1
 Requires:       libvirt-devel ansible
 Requires:       python34-iptables python34-cryptography python34-pbr
 Requires:       python34-GitPython python34-pygerrit2 python34-distro
+Requires:       git
 
 %description
 Scripts for OPNFV deployment using Apex

diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 18ddab4..90c237b 100644 (file)
--- 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