Dev: Dockerfile: Update dockerfile after corosync3 is in the Factory (C…

…lusterLabs#1470)

Changes include:
- Dev: Dockerfile: Update dockerfile after corosync3 is in the Factory
- Dev: testcases: Replace IPaddr with IPaddr2
- Dev: testcases: Replace LVM with LVM-activate

scripts/lvm/main.yml

@@ -6,7 +6,7 @@ longdesc: >-
   Does not create the referenced volume group.
 
 include:
-  - agent: ocf:heartbeat:LVM
+  - agent: ocf:heartbeat:LVM-activate
     name: lvm
     parameters:
       - name: id

templates/virtual-ip

@@ -33,7 +33,7 @@
 
 %generate
 
-primitive %_ ocf:heartbeat:IPaddr
+primitive %_ ocf:heartbeat:IPaddr2
 	params ip=%_:ip
 	opt cidr_netmask=%_:netmask
 	opt lvs_support=%_:lvs_support

test/testcases/bugs.exp

@@ -210,8 +210,8 @@ property SAPHanaSR_2: \
 INFO: 6: pulling in template virtual-ip
 .INP: load vip
 .INP: apply update
-.EXT crm_resource --show-metadata ocf:heartbeat:IPaddr
-.EXT crm_resource --list-ocf-alternatives IPaddr
+.EXT crm_resource --show-metadata ocf:heartbeat:IPaddr2
+.EXT crm_resource --list-ocf-alternatives IPaddr2
 .INP: up
 .INP: commit
 .EXT crm_resource --list-options=primitive --all --output-as=xml

test/testcases/ra

@@ -1,6 +1,6 @@
 session RA interface
 ra
-providers IPaddr
+providers IPaddr2
 providers Dummy
 info ocf:pacemaker:Dummy
 info stonith:external/ssh

test/testcases/ra.exp

@@ -1,6 +1,6 @@
 .TRY RA interface
 .INP: ra
-.INP: providers IPaddr
+.INP: providers IPaddr2
 
 heartbeat
 .INP: providers Dummy

test/testcases/scripts.exp

@@ -9,7 +9,7 @@
 .EXT crm_resource --show-metadata ocf:heartbeat:db2
 .EXT crm_resource --show-metadata ocf:heartbeat:exportfs
 .EXT crm_resource --show-metadata systemd:haproxy
-.EXT crm_resource --show-metadata ocf:heartbeat:LVM
+.EXT crm_resource --show-metadata ocf:heartbeat:LVM-activate
 .EXT crm_resource --show-metadata ocf:heartbeat:MailTo
 .EXT crm_resource --show-metadata ocf:heartbeat:nginx
 .EXT crm_resource --show-metadata ocf:heartbeat:Raid1
@@ -110,7 +110,7 @@ Script:
 
 check-uptime     Check uptime of nodes
 gfs2-base        GFS2 File System Base (Cloned)
-lvm              Controls the availability of an LVM Volume Group
+lvm              This agent activates/deactivates logical volumes.
 raid1            Manages Linux software RAID (MD) devices on shared storage
 sapdb            SAP Database Instance
 sapinstance      SAP Instance

test_container/Dockerfile

@@ -7,11 +7,7 @@ RUN zypper refresh && \
     zypper -n install systemd \
         make autoconf automake vim which libxslt-tools mailx iproute2 iputils bzip2 openssh tar file glibc-locale-base firewalld libopenssl1_1 dos2unix iptables cpio gawk \
         python3 python3-pip python3-lxml python3-python-dateutil python3-setuptools python3-PyYAML python3-curses python3-behave python3-coverage python3-packaging \
-        csync2 libglue-devel corosync corosync-qdevice pacemaker booth corosync-qnetd
-RUN zypper ar -f -G https://download.opensuse.org/repositories/network:/ha-clustering:/Unstable/openSUSE_Tumbleweed/ repo_corosync3 && \
-    zypper --non-interactive refresh && \
-    zypper --non-interactive up --allow-vendor-change -y corosync corosync-qdevice corosync-qnetd pacemaker && \
-    zypper --non-interactive in libknet1-*
+        csync2 libglue-devel corosync corosync-qdevice pacemaker booth corosync-qnetd libknet1-*
 
 RUN ssh-keygen -t rsa -f /root/.ssh/id_rsa -N '' && \
     cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \