Merge ~lucaskanashiro/ubuntu/+source/resource-agents:rename-binary-pkgs into ubuntu/+source/resource-agents:ubuntu/devel

[Lucas Kanashiro]

Create a transitional package called 'resource-agents', and rename the binary containing supported agents to 'resource-agents-base' and the binary containing the unsupported agents to 'resource-agents-extra'.

I am not sure yet about the right terms we want to use in the package descriptions, I am waiting on Rick to define that.

The proposed package is available in this PPA:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ha-agents-split

autopkgtest summary:

autopkgtest [18:23:57]: @@@@@@@@@@@@@@@@@@@@ summary
IPaddr2 PASS
command1 PASS
command2 PASS
command3 PASS
command4 PASS
command5 PASS
command6 PASS
command7 PASS
command8 PASS
command9 PASS
command10 PASS
command11 PASS
command12 PASS
command13 PASS

[Lucas Kanashiro (lucaskanashiro)]

I ran the tests for the supported agents and they are still passing, no regression.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Lucas.

I'm leaving a bunch of comments that I think should be addressed, but they're mostly about updating comments/variables names/file names. There is one issue with the package, though: the resource-agents-extra package does not have the proper Conflicts/Breaks directives, which breaks the downgrade of the package. This diff fixed it for me:

diff --git a/debian/control b/debian/control
index 2ae7451..026c27e 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,10 @@ Recommends: libxml2-utils,
             net-tools,
             resource-agents-base (>= ${source:Version})
 Suggests: python3-googleapi
-Replaces: cluster-agents (<= 1:1.0.4-1), rgmanager (<= 3.0.12-2+b1)
+Replaces: cluster-agents (<= 1:1.0.4-1),
+ rgmanager (<= 3.0.12-2+b1),
+ resource-agents (<< 1:4.7.0-1ubuntu2)
+Breaks: resource-agents (<< 1:4.7.0-1ubuntu2)
 Conflicts: cluster-agents (<= 1:1.0.4-1), rgmanager (<= 3.0.12-2+b1)
 Description: Cluster Resource Agents
  This package contains cluster resource agents (RAs) compliant with the Open

Other than what I pointed here, the changes LGTM.

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

I think I forgot to mention, but the "debian/supported-agents" file should also be renamed IMO.

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Sergio. I believe I addressed all your comments, up for review again.

[Sergio Durigan Junior (sergiodj)]

Thanks, Lucas. This LGTM now (module some very minor details that I'm leaving as comments). I've verified that the package builds, installs, upgrades and downgrades fine.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Sergio, applied the fixes and uploaded the package:

$ git push pkg upload/1%4.7.0-1ubuntu4
Enumerating objects: 46, done.
Counting objects: 100% (46/46), done.
Delta compression using up to 32 threads
Compressing objects: 100% (34/34), done.
Writing objects: 100% (34/34), 4.50 KiB | 2.25 MiB/s, done.
Total 34 (delta 26), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/resource-agents
 * [new tag] upload/1%4.7.0-1ubuntu4 -> upload/1%4.7.0-1ubuntu4
$ dput ubuntu ../resource-agents_4.7.0-1ubuntu4_source.changes
Checking signature on .changes
gpg: ../resource-agents_4.7.0-1ubuntu4_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../resource-agents_4.7.0-1ubuntu4.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading resource-agents_4.7.0-1ubuntu4.dsc: done.
  Uploading resource-agents_4.7.0-1ubuntu4.debian.tar.xz: done.
  Uploading resource-agents_4.7.0-1ubuntu4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 2f3a429..a05a93e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+resource-agents (1:4.7.0-1ubuntu4) impish; urgency=medium
+
+  * Rename resource-agents with non-curated agents to resource-agents-extra.
+    - d/control: rename the resource-agents binary package to
+      resource-agents-extra.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'unsupported' term to 'non-curated'.
+    - Rename RESOURCE_AGENTS_DIR to RESOURCE_AGENTS_EXTRA_DIR with the
+      appropriate path in the following files:
+      + d/install-common-files
+      + d/install-common-files
+      + d/install-supported-agents
+      + d/resource-agents-cleanup
+      + d/rules
+  * Rename resource-agents-supported with curated agents to
+    resource-agents-base.
+    - d/control:
+      + Rename resource-agents-supported binary package to resource-agents-base.
+      + Update the short and long description to not use the 'supported' term.
+      + Rename the supportedAgents substvar to curatedAgents.
+    - d/curated-agents: new file, this is the renamed d/supported-agents file.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'supported' term to 'curated'.
+    - d/install-common-files: Rename all the occurrences of the 'supported'
+      term to 'curated'.
+    - d/install-curated-agents: new file, this is the renamed
+      d/install-supported-agents script.
+    - d/rules: call d/install-curated-agents instead of
+      d/install-supported-agents.
+    - d/t/control: make IPaddr2 test depend on resource-agents-base instead of
+      resource-agents-supported.
+  * Create a transitional binary package called resource-agents.
+    - d/control: add a new section for the transitional package, adding
+      resource-agents-{base,extra} as dependencies.
+  * d/control: add a missing Breaks/Replaces relation to the
+    resource-agents-base.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 12 May 2021 16:15:15 -0300
+
 resource-agents (1:4.7.0-1ubuntu3) impish; urgency=medium
 
   * d/control: make resource-agents recommend resource-agents-supported.
diff --git a/debian/control b/debian/control
index e2f229f..4265cb2 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,20 @@ Vcs-Browser: https://salsa.debian.org/ha-team/resource-agents
 Vcs-Git: https://salsa.debian.org/ha-team/resource-agents.git
 
 Package: resource-agents
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends},
+         resource-agents-base (>= ${source:Version}),
+         resource-agents-extra (>= ${source:Version})
+Description: Transitional package for the resource-agents
+ This package contains cluster resource agents (RAs) compliant with the Open
+ Cluster Framework (OCF) specification, used to interface with various services
+ in a High Availability environment managed by the Pacemaker resource manager.
+ .
+ This is a transitional package which provides a set of curated
+ (resource-agents-base) and non-curated (resource-agents-extra) agents.
+
+Package: resource-agents-extra
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends},
          cluster-glue,
@@ -45,9 +59,12 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends},
          resource-agents-common (>= ${source:Version})
 Recommends: libxml2-utils,
             net-tools,
-            resource-agents-supported (>= ${source:Version})
+            resource-agents-base (>= ${source:Version})
 Suggests: python3-googleapi
-Replaces: cluster-agents (<= 1:1.0.4-1), rgmanager (<= 3.0.12-2+b1)
+Replaces: cluster-agents (<= 1:1.0.4-1),
+          rgmanager (<= 3.0.12-2+b1),
+          resource-agents (<< 1:4.7.0-1ubuntu2)
+Breaks: resource-agents (<< 1:4.7.0-1ubuntu2)
 Conflicts: cluster-agents (<= 1:1.0.4-1), rgmanager (<= 3.0.12-2+b1)
 Description: Cluster Resource Agents
  This package contains cluster resource agents (RAs) compliant with the Open
@@ -57,7 +74,7 @@ Description: Cluster Resource Agents
  Agents included:
   ${agents}
 
-Package: resource-agents-supported
+Package: resource-agents-base
 Architecture: all
 Depends: ${misc:Depends},
          resource-agents-common (>= ${source:Version})
@@ -67,16 +84,16 @@ Replaces: cluster-agents (<= 1:1.0.4-1),
 Breaks: resource-agents (<< 1:4.7.0-1ubuntu2)
 Conflicts: cluster-agents (<= 1:1.0.4-1),
            rgmanager (<= 3.0.12-2+b1)
-Description: Supported Cluster Resource Agents
+Description: Cluster Resource Agents curated by Ubuntu
  This package contains cluster resource agents (RAs) compliant with the Open
  Cluster Framework (OCF) specification, used to interface with various services
  in a High Availability environment managed by the Pacemaker resource manager.
  .
- This package contains the Resource Agents that are officially supported by
- Ubuntu.
+ This package contains the Resource Agents that are curated by the Ubuntu
+ Server team.
  .
  Agents included:
-  ${supportedAgents}
+  ${curatedAgents}
 
 Package: resource-agents-common
 Architecture: any
diff --git a/debian/supported-agents b/debian/curated-agents
similarity index 100%
rename from debian/supported-agents
rename to debian/curated-agents
diff --git a/debian/extract-agents-description b/debian/extract-agents-description
index 9c11eb2..9824f4d 100755
--- a/debian/extract-agents-description
+++ b/debian/extract-agents-description
@@ -5,18 +5,18 @@ set -x
 export LC_ALL=C
 
 agents=()
-supported_agents=()
-unsupported_agents=()
+curated_agents=()
+non_curated_agents=()
 
-readonly RESOURCE_AGENTS_DIR="debian/resource-agents"
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
 readonly RESOURCE_AGENTS_COMMON_DIR="debian/resource-agents-common"
-readonly RESOURCE_AGENTS_SUPPORTED_DIR="debian/resource-agents-supported"
-readonly UNSUPPORTED_HEARTBEAT_DIR="$RESOURCE_AGENTS_DIR/usr/lib/ocf/resource.d/heartbeat"
-readonly SUPPORTED_HEARTBEAT_DIR="$RESOURCE_AGENTS_SUPPORTED_DIR/usr/lib/ocf/resource.d/heartbeat"
+readonly RESOURCE_AGENTS_BASE_DIR="debian/resource-agents-base"
+readonly NON_CURATED_HEARTBEAT_DIR="$RESOURCE_AGENTS_EXTRA_DIR/usr/lib/ocf/resource.d/heartbeat"
+readonly CURATED_HEARTBEAT_DIR="$RESOURCE_AGENTS_BASE_DIR/usr/lib/ocf/resource.d/heartbeat"
 
 export OCF_ROOT="$RESOURCE_AGENTS_COMMON_DIR/usr/lib/ocf"
 
-for agent in $SUPPORTED_HEARTBEAT_DIR/* $UNSUPPORTED_HEARTBEAT_DIR/*; do
+for agent in $CURATED_HEARTBEAT_DIR/* $NON_CURATED_HEARTBEAT_DIR/*; do
   name=$(basename "$agent")
   short_desc=$("$agent" meta-data | xml_grep --root resource-agent/shortdesc --text_only /dev/stdin)
 
@@ -30,15 +30,15 @@ for agent in $SUPPORTED_HEARTBEAT_DIR/* $UNSUPPORTED_HEARTBEAT_DIR/*; do
 done
 
 for agent in "${agents[@]}"; do
-  if grep -qFx $(cut -d: -f1 <<< "$agent") debian/supported-agents; then
-    supported_agents+=("$agent\${Newline}")
+  if grep -qFx $(cut -d: -f1 <<< "$agent") debian/curated-agents; then
+    curated_agents+=("$agent\${Newline}")
   else
-    unsupported_agents+=("$agent\${Newline}")
+    non_curated_agents+=("$agent\${Newline}")
   fi
 done
 
-echo "agents=${unsupported_agents[*]}" >> debian/resource-agents.substvars
-echo "supportedAgents=${supported_agents[*]}" >> debian/resource-agents-supported.substvars
+echo "agents=${non_curated_agents[*]}" >> debian/resource-agents-extra.substvars
+echo "curatedAgents=${curated_agents[*]}" >> debian/resource-agents-base.substvars
 
 # Clean up pycache
 rm -rf debian/resource-agents-common/usr/lib/ocf/lib/heartbeat/__pycache__
diff --git a/debian/install-common-files b/debian/install-common-files
index 94dc125..e1c652d 100755
--- a/debian/install-common-files
+++ b/debian/install-common-files
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# This script aims to install all the common files used by resource-agents and
-# resource-agents-supported into resource-agents-common binary package.
+# This script aims to install all the common files used by resource-agents-base
+# and resource-agents-extra into resource-agents-common binary package.
 
 set -x
 
-readonly RESOURCE_AGENTS_DIR="debian/resource-agents"
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
 readonly RESOURCE_AGENTS_COMMON_DIR="debian/resource-agents-common"
 
 readonly COMMON_DIRS="usr/include/heartbeat usr/lib/heartbeat
@@ -15,7 +15,7 @@ readonly COMMON_DIRS="usr/include/heartbeat usr/lib/heartbeat
 
 for dir in $COMMON_DIRS; do
   mkdir -p "$RESOURCE_AGENTS_COMMON_DIR/$dir"
-  mv "$RESOURCE_AGENTS_DIR/$dir"/* "$RESOURCE_AGENTS_COMMON_DIR/$dir"
+  mv "$RESOURCE_AGENTS_EXTRA_DIR/$dir"/* "$RESOURCE_AGENTS_COMMON_DIR/$dir"
 done
 
 mkdir -p "$RESOURCE_AGENTS_COMMON_DIR"/usr/lib/ocf/resource.d/heartbeat \
@@ -25,17 +25,17 @@ readonly TARGETS="ocf-binaries ocf-directories ocf-returncodes ocf-shellfuncs"
 for tgt in $TARGETS; do
   ln -r -s -T "$RESOURCE_AGENTS_COMMON_DIR/usr/lib/ocf/lib/heartbeat/$tgt" \
               "$RESOURCE_AGENTS_COMMON_DIR/usr/lib/ocf/resource.d/heartbeat/.$tgt"
-  rm "$RESOURCE_AGENTS_DIR/usr/lib/ocf/resource.d/heartbeat/.$tgt"
+  rm "$RESOURCE_AGENTS_EXTRA_DIR/usr/lib/ocf/resource.d/heartbeat/.$tgt"
 done
 
 readonly FILES="metadata.rng ra-api-1.dtd"
 for file in $FILES; do
-  mv "$RESOURCE_AGENTS_DIR/usr/share/resource-agents/$file" \
+  mv "$RESOURCE_AGENTS_EXTRA_DIR/usr/share/resource-agents/$file" \
      "$RESOURCE_AGENTS_COMMON_DIR"/usr/share/resource-agents/
 done
 
 readonly OCFT_FILES="README README.zh_CN caselib helpers.sh runocft runocft.prereq"
 for file in $OCFT_FILES; do
-  mv "$RESOURCE_AGENTS_DIR/usr/share/resource-agents/ocft/$file" \
+  mv "$RESOURCE_AGENTS_EXTRA_DIR/usr/share/resource-agents/ocft/$file" \
      "$RESOURCE_AGENTS_COMMON_DIR"/usr/share/resource-agents/ocft/
 done
diff --git a/debian/install-curated-agents b/debian/install-curated-agents
new file mode 100755
index 0000000..be9cdd5
--- /dev/null
+++ b/debian/install-curated-agents
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# This script aims to install all the agents curated by the Ubuntu community
+# into resource-agents-base binary package.
+
+set -x
+
+readonly RESOURCE_AGENTS_BASE="debian/resource-agents-base"
+readonly RESOURCE_AGENTS_EXTRA="debian/resource-agents-extra"
+
+mkdir -p $RESOURCE_AGENTS_BASE/usr/share/resource-agents/ocft/configs/ \
+	 $RESOURCE_AGENTS_BASE/usr/share/man/man7/ \
+	 $RESOURCE_AGENTS_BASE/usr/lib/ocf/resource.d/heartbeat/
+
+for agent in $(cat debian/curated-agents); do
+  mv $RESOURCE_AGENTS_EXTRA/usr/lib/ocf/resource.d/heartbeat/$agent \
+     $RESOURCE_AGENTS_BASE/usr/lib/ocf/resource.d/heartbeat/
+  mv $RESOURCE_AGENTS_EXTRA/usr/share/man/man7/ocf_heartbeat_$agent.7 \
+     $RESOURCE_AGENTS_BASE/usr/share/man/man7/
+  mv $RESOURCE_AGENTS_EXTRA/usr/share/resource-agents/ocft/configs/$agent \
+     $RESOURCE_AGENTS_BASE/usr/share/resource-agents/ocft/configs/
+done
diff --git a/debian/install-ldirectord-files b/debian/install-ldirectord-files
index 32974fd..39c97d0 100755
--- a/debian/install-ldirectord-files
+++ b/debian/install-ldirectord-files
@@ -4,7 +4,7 @@
 
 set -x
 
-readonly RESOURCE_AGENTS_DIR="debian/resource-agents"
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
 readonly LDIRECTORD_DIR="debian/ldirectord"
 
 mkdir -p $LDIRECTORD_DIR/etc/ha.d/resource.d \
@@ -15,12 +15,12 @@ mkdir -p $LDIRECTORD_DIR/etc/ha.d/resource.d \
 	 $LDIRECTORD_DIR/usr/share/man/man8
 
 cp debian/ldirectord.cf $LDIRECTORD_DIR/etc/ha.d
-mv $RESOURCE_AGENTS_DIR/etc/ha.d/resource.d/ \
+mv $RESOURCE_AGENTS_EXTRA_DIR/etc/ha.d/resource.d/ \
    $LDIRECTORD_DIR/etc/ha.d/
-mv $RESOURCE_AGENTS_DIR/etc/init.d $LDIRECTORD_DIR/etc/
-mv $RESOURCE_AGENTS_DIR/etc/logrotate.d $LDIRECTORD_DIR/etc/
-mv $RESOURCE_AGENTS_DIR/lib/systemd/system/ldirectord.service \
+mv $RESOURCE_AGENTS_EXTRA_DIR/etc/init.d $LDIRECTORD_DIR/etc/
+mv $RESOURCE_AGENTS_EXTRA_DIR/etc/logrotate.d $LDIRECTORD_DIR/etc/
+mv $RESOURCE_AGENTS_EXTRA_DIR/lib/systemd/system/ldirectord.service \
    $LDIRECTORD_DIR/lib/systemd/system/
-mv $RESOURCE_AGENTS_DIR/usr/sbin/ldirectord $LDIRECTORD_DIR/usr/sbin
-mv $RESOURCE_AGENTS_DIR/usr/share/man/man8/ldirectord.8 \
+mv $RESOURCE_AGENTS_EXTRA_DIR/usr/sbin/ldirectord $LDIRECTORD_DIR/usr/sbin
+mv $RESOURCE_AGENTS_EXTRA_DIR/usr/share/man/man8/ldirectord.8 \
    $LDIRECTORD_DIR/usr/share/man/man8/
diff --git a/debian/install-supported-agents b/debian/install-supported-agents
deleted file mode 100755
index 0ff0612..0000000
--- a/debian/install-supported-agents
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# This script aims to install all the agents supported by the Ubuntu community
-# into resource-agents-supported binary package.
-
-set -x
-
-readonly SUPPORTED_AGENTS="debian/resource-agents-supported"
-readonly RESOURCE_AGENTS="debian/resource-agents"
-
-mkdir -p $SUPPORTED_AGENTS/usr/share/resource-agents/ocft/configs/ \
-	 $SUPPORTED_AGENTS/usr/share/man/man7/ \
-	 $SUPPORTED_AGENTS/usr/lib/ocf/resource.d/heartbeat/
-
-for agent in $(cat debian/supported-agents); do
-  mv $RESOURCE_AGENTS/usr/lib/ocf/resource.d/heartbeat/$agent \
-     $SUPPORTED_AGENTS/usr/lib/ocf/resource.d/heartbeat/
-  mv $RESOURCE_AGENTS/usr/share/man/man7/ocf_heartbeat_$agent.7 \
-     $SUPPORTED_AGENTS/usr/share/man/man7/
-  mv $RESOURCE_AGENTS/usr/share/resource-agents/ocft/configs/$agent \
-     $SUPPORTED_AGENTS/usr/share/resource-agents/ocft/configs/
-done
diff --git a/debian/resource-agents-cleanup b/debian/resource-agents-cleanup
index 0134280..ad34bde 100755
--- a/debian/resource-agents-cleanup
+++ b/debian/resource-agents-cleanup
@@ -2,12 +2,12 @@
 
 set -x
 
-readonly RESOURCE_AGENTS_DIR="debian/resource-agents"
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
 
 # Those directories were moved to another binary package
 readonly EMPTY_DIRS="etc lib run usr/include usr/lib/heartbeat usr/sbin
                      usr/share/man/man8 usr/share/pkgconfig usr/lib/tmpfiles.d"
 
 for dir in $EMPTY_DIRS; do
-  rm -rf $RESOURCE_AGENTS_DIR/$dir
+  rm -rf $RESOURCE_AGENTS_EXTRA_DIR/$dir
 done
diff --git a/debian/resource-agents-extra.lintian-overrides b/debian/resource-agents-extra.lintian-overrides
new file mode 100644
index 0000000..b5de12c
--- /dev/null
+++ b/debian/resource-agents-extra.lintian-overrides
@@ -0,0 +1,5 @@
+# ignore manpage warnings
+resource-agents-extra: groff-message usr/share/man/man7/ocf_heartbeat_openstack-info.7.gz 37: warning [p 1, 2.3i]: can't break line
+
+# ignore notices about usr/lib
+resource-agents-extra: executable-in-usr-lib usr/lib/ocf/resource.d/heartbeat/*
diff --git a/debian/resource-agents.lintian-overrides b/debian/resource-agents.lintian-overrides
deleted file mode 100644
index 26a2035..0000000
--- a/debian/resource-agents.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# ignore manpage warnings
-resource-agents: groff-message usr/share/man/man7/ocf_heartbeat_openstack-info.7.gz 37: warning [p 1, 2.3i]: can't break line
-
-# ignore notices about usr/lib
-resource-agents: executable-in-usr-lib usr/lib/ocf/resource.d/heartbeat/*
diff --git a/debian/rules b/debian/rules
index 9e5f9ce..181c55f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk
 
-RESOURCE_AGENTS_DIR="$(CURDIR)/debian/resource-agents"
+RESOURCE_AGENTS_EXTRA_DIR="$(CURDIR)/debian/resource-agents-extra"
 
 %:
 	dh $@ --with python3
@@ -28,12 +28,12 @@ override_dh_auto_configure:
 		    REBOOT=/sbin/reboot POWEROFF_CMD=/sbin/poweroff
 
 override_dh_auto_install:
-	$(MAKE) install DESTDIR=$(RESOURCE_AGENTS_DIR)
+	$(MAKE) install DESTDIR=$(RESOURCE_AGENTS_EXTRA_DIR)
 
 override_dh_install:
 	debian/install-ldirectord-files
 	debian/install-common-files
-	debian/install-supported-agents
+	debian/install-curated-agents
 	debian/resource-agents-cleanup
 
 	dh_install
diff --git a/debian/tests/control b/debian/tests/control
index 4905200..4b83b1d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: IPaddr2
-Depends: resource-agents-supported
+Depends: resource-agents-base
 Restrictions: needs-root, isolation-container
 
 Test-Command: service ldirectord status