From e10a3d1acb74e0a1bfeab07d13eb4676ecb110dd Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 14 Aug 2015 10:02:41 -0500 Subject: [PATCH] testnode: rename ceph_packages to ceph_packages_to_remove Signed-off-by: Andrew Schoen --- roles/testnode/README.rst | 2 +- roles/testnode/defaults/main.yml | 2 +- roles/testnode/tasks/apt/packages.yml | 4 ++-- roles/testnode/tasks/yum/packages.yml | 2 +- roles/testnode/vars/apt_systems.yml | 2 +- roles/testnode/vars/yum_systems.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst index ba149041..e9ea9508 100644 --- 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 af386927..caad337d 100644 --- 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 398808aa..bbbd13be 100644 --- 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 c4cc5649..bfde4925 100644 --- 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 d817e939..95866a5f 100644 --- 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 f683cde1..c8fba089 100644 --- 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 -- 2.47.3