testnode: rename ceph_packages to ceph_packages_to_remove

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst
index ba149041491932cfa91ea9b53886af432f80faad..e9ea95088ab098c6c89746b2d6a3fac2cda7faa2 100644 (file)
--- a/roles/testnode/README.rst
+++ b/roles/testnode/README.rst
@@ -116,7 +116,7 @@ for that specific version. This is the same idea behind the vars that control ap
 A list of ceph packages to remove. It's safe to add packages to this list that aren't currently installed or don't exist. Both ``apt-get`` and ``yum``
 handle this case correctly. This list is defined in ``vars/apt_systems.yml`` and ``vars/yum_systems.yml``::
 
-    ceph_packages: []
+    ceph_packages_to_remove: []
 
 A list of packages to remove. These lists are defined in the var files in ``vars/``::
 

diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index af3869278b25d11eb41ceca8a4ffbfc6d39725ae..caad337d374d8cfc6d6ed589fe7784f9a633211f 100644 (file)
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -29,7 +29,7 @@ epel_packages: []
 common_packages: []
 
 # packages used by ceph we want to ensure are removed
-ceph_packages: []
+ceph_packages_to_remove: []
 packages_to_remove: []
 packages_to_upgrade: []
 

diff --git a/roles/testnode/tasks/apt/packages.yml b/roles/testnode/tasks/apt/packages.yml
index 398808aac4d1810ca1b1498b137cf1ec7c1f79e9..bbbd13bed971816a00bc908b7d8444f88d9345f7 100644 (file)
--- a/roles/testnode/tasks/apt/packages.yml
+++ b/roles/testnode/tasks/apt/packages.yml
@@ -3,8 +3,8 @@
   apt:
     name: "{{ item }}"
     state: absent
-  with_items: ceph_packages|list + packages_to_remove|list
-  when: ceph_packages|length > 0 or
+  with_items: ceph_packages_to_remove|list + packages_to_remove|list
+  when: ceph_packages_to_remove|length > 0 or
         packages_to_remove|length > 0
 
 - name: Upgrade packages

diff --git a/roles/testnode/tasks/yum/packages.yml b/roles/testnode/tasks/yum/packages.yml
index c4cc5649addf75dac4ae8f9aee363b5e9331185c..bfde49252ef515587139ebd125d443094d225c4e 100644 (file)
--- a/roles/testnode/tasks/yum/packages.yml
+++ b/roles/testnode/tasks/yum/packages.yml
@@ -28,7 +28,7 @@
   yum:
     name: "{{ item }}"
     state: absent
-  with_items: ceph_packages
+  with_items: ceph_packages_to_remove
   tags:
     - remove-ceph
 

diff --git a/roles/testnode/vars/apt_systems.yml b/roles/testnode/vars/apt_systems.yml
index d817e9399c728e2874627f83700f23c0dd435a9f..95866a5f8f6eebc258b217afb03c1733e04c225b 100644 (file)
--- a/roles/testnode/vars/apt_systems.yml
+++ b/roles/testnode/vars/apt_systems.yml
@@ -3,7 +3,7 @@ ntp_service_name: ntp
 ssh_service_name: ssh
 nfs_service: nfs-kernel-server
 
-ceph_packages:
+ceph_packages_to_remove:
   - ceph
   - ceph-common
   - libcephfs1

diff --git a/roles/testnode/vars/yum_systems.yml b/roles/testnode/vars/yum_systems.yml
index f683cde1a4f620318e9a9617d41a6ebcdb89ac79..c8fba0898cef45547d48469b5298159a3fd88c69 100644 (file)
--- a/roles/testnode/vars/yum_systems.yml
+++ b/roles/testnode/vars/yum_systems.yml
@@ -3,7 +3,7 @@ ntp_service_name: ntpd
 ssh_service_name: sshd
 
 # ceph packages that we ensure do not exist
-ceph_packages:
+ceph_packages_to_remove:
   - ceph
   - ceph-common
   - ceph-debuginfo