From 46531ae0375f669958f281512b7e09be30f54282 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 11 Jan 2019 10:38:56 +0100 Subject: [PATCH] Clean .spec file from ceph-common-coreos role references The removal of ceph-common-coreos missed the legacy references in the .spec file and the group_vars sample. Closes #3493 --- ceph-ansible.spec.in | 5 ----- group_vars/common-coreoss.yml.sample | 17 ----------------- 2 files changed, 22 deletions(-) delete mode 100644 group_vars/common-coreoss.yml.sample diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in index a320ce00ce..833a8a3c92 100644 --- a/ceph-ansible.spec.in +++ b/ceph-ansible.spec.in @@ -39,11 +39,6 @@ for f in ansible.cfg *.yml *.sample group_vars roles library plugins infrastruct done pushd %{buildroot}%{_datarootdir}/ceph-ansible - # Strip coreos files. - # These are unneeded on RPM-based distros, and the playbooks download random - # things from around the internet. - rm -r roles/ceph-common-coreos - rm group_vars/common-coreoss.yml.sample # These untested playbooks are too unstable for users. rm -r infrastructure-playbooks/untested-by-ci %if ! 0%{?fedora} && ! 0%{?centos} diff --git a/group_vars/common-coreoss.yml.sample b/group_vars/common-coreoss.yml.sample deleted file mode 100644 index 32ae295533..0000000000 --- a/group_vars/common-coreoss.yml.sample +++ /dev/null @@ -1,17 +0,0 @@ ---- -# Variables here are applicable to all host groups NOT roles - -# This sample file generated by generate_group_vars_sample.sh - -# Dummy variable to avoid error because ansible does not recognize the -# file as a good configuration file when no variable in it. -dummy: - -#coreos_pypy_version: 4.0.1 -#coreos_pypy_arch: linux64 -#coreos_pypy_url: https://bitbucket.org/pypy/pypy/downloads/pypy-{{coreos_pypy_version}}-{{coreos_pypy_arch}}.tar.bz2 -#pypy_directory: /opt/pypy -#pypy_binary_directory: /opt/bin -#pip_url: https://bootstrap.pypa.io/get-pip.py -#local_temp_directory: /tmp -