Dev: behave: Adjust functional tests for previous commit

data-manifest

@@ -82,7 +82,6 @@ test/features/crm_report_normal.feature
 test/features/environment.py
 test/features/geo_setup.feature
 test/features/healthcheck.feature
-test/features/ocfs2.feature
 test/features/qdevice_options.feature
 test/features/qdevice_setup_remove.feature
 test/features/qdevice_usercase.feature
@@ -197,7 +196,6 @@ test/unittests/test_gv.py
 test/unittests/test_handles.py
 test/unittests/test_lock.py
 test/unittests/test_objset.py
-test/unittests/test_ocfs2.py
 test/unittests/test_parallax.py
 test/unittests/test_parse.py
 test/unittests/test_prun.py

test/features/bootstrap_options.feature

@@ -42,7 +42,7 @@ Feature: crmsh bootstrap process - options
   @clean
   Scenario: Stage validation
     When    Try "crm cluster init fdsf -y" on "hanode1"
-    Then    Expected "Invalid stage: fdsf(available stages: ssh, csync2, corosync, sbd, cluster, ocfs2, admin, qdevice)" in stderr
+    Then    Expected "Invalid stage: fdsf(available stages: ssh, csync2, corosync, sbd, cluster, admin, qdevice)" in stderr
     When    Try "crm cluster join fdsf -y" on "hanode1"
     Then    Expected "Invalid stage: fdsf(available stages: ssh, csync2, ssh_merge, cluster)" in stderr
     When    Try "crm cluster join ssh -y" on "hanode1"

test/features/steps/const.py

@@ -134,26 +134,13 @@
                         Block device to use for SBD fencing, use ";" as
                         separator or -s multiple times for multi path (up to 3
                         devices)
-  -o DEVICE, --ocfs2-device DEVICE
-                        Block device to use for OCFS2; When using Cluster LVM2
-                        to manage the shared storage, user can specify one or
-                        multiple raw disks, use ";" as separator or -o
-                        multiple times for multi path (must specify -C option)
-                        NOTE: this is a Technical Preview
-  -C, --cluster-lvm2    Use Cluster LVM2 (only valid together with -o option)
-                        NOTE: this is a Technical Preview
-  -m MOUNT, --mount-point MOUNT
-                        Mount point for OCFS2 device (default is
-                        /srv/clusterfs, only valid together with -o option)
-                        NOTE: this is a Technical Preview
 
 Stage can be one of:
     ssh         Create SSH keys for passwordless SSH between cluster nodes
     csync2      Configure csync2
     corosync    Configure corosync
     sbd         Configure SBD (requires -s <dev>)
     cluster     Bring the cluster online
-    ocfs2       Configure OCFS2 (requires -o <dev>) NOTE: this is a Technical Preview
     admin       Create administration virtual IP (optional)
     qdevice     Configure qdevice and qnetd
 
@@ -181,12 +168,6 @@
   # Setup the cluster on the current node, with QDevice
   crm cluster init --qnetd-hostname <qnetd addr> -y
 
-  # Setup the cluster on the current node, with SBD+OCFS2
-  crm cluster init -s <share disk1> -o <share disk2> -y
-
-  # Setup the cluster on the current node, with SBD+OCFS2+Cluster LVM
-  crm cluster init -s <share disk1> -o <share disk2> -o <share disk3> -C -y
-
   # Add SBD on a running cluster
   crm cluster init sbd -s <share disk> -y
 
@@ -197,10 +178,7 @@
   crm cluster init sbd -S -y
 
   # Add QDevice on a running cluster
-  crm cluster init qdevice --qnetd-hostname <qnetd addr> -y
-
-  # Add OCFS2+Cluster LVM on a running cluster
-  crm cluster init ocfs2 -o <share disk1> -o <share disk2> -C -y'''
+  crm cluster init qdevice --qnetd-hostname <qnetd addr> -y'''
 
 
 CRM_CLUSTER_JOIN_H_OUTPUT = '''Join existing cluster

test/run-functional-tests

@@ -14,7 +14,7 @@ HA_NETWORK_ARRAY[1]=$HA_NETWORK_SECOND
 HA_NETWORK_V6_ARRAY[0]="2001:db8:10::/64"
 HA_NETWORK_V6_ARRAY[1]="2001:db8:20::/64"
 BEHAVE_CASE_DIR="$(dirname $0)/features/"
-BEHAVE_CASE_EXCLUDE="sbd|ocfs2"
+BEHAVE_CASE_EXCLUDE="sbd"
 
 read -r -d '' SSHD_CONFIG_AZURE << EOM
 PermitRootLogin no