diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 70e3d6884..2615c00de 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -296,7 +296,6 @@ dummy: #radosgw_s3_auth_use_keystone: "true" #radosgw_nss_db_path: /var/lib/ceph/radosgw/ceph-radosgw.{{ ansible_hostname }}/nss # Rados Gateway options -#redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2 #email_address: foo@bar.com ## REST API options diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index deaec7f8a..3ee51b481 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -289,7 +289,6 @@ radosgw_keystone_revocation_internal: 900 radosgw_s3_auth_use_keystone: "true" radosgw_nss_db_path: /var/lib/ceph/radosgw/ceph-radosgw.{{ ansible_hostname }}/nss # Rados Gateway options -redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2 email_address: foo@bar.com ## REST API options diff --git a/roles/ceph-common/templates/ceph-extra.repo b/roles/ceph-common/templates/ceph-extra.repo deleted file mode 100644 index dc2d27521..000000000 --- a/roles/ceph-common/templates/ceph-extra.repo +++ /dev/null @@ -1,30 +0,0 @@ -# {{ ansible_managed }} - -[ceph-extras] -name=Ceph Extras Packages -baseurl=http://ceph.com/packages/ceph-extras/rpm/{{ redhat_distro_ceph_extra }}/$basearch -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://download.ceph.com/keys/release.asc - -{% if (redhat_distro_ceph_extra != "centos6.4" and redhat_distro_ceph_extra != "rhel6.4" and redhat_distro_ceph_extra != "rhel6.5") %} -[ceph-extras-noarch] -name=Ceph Extras noarch -baseurl=http://ceph.com/packages/ceph-extras/rpm/{{ redhat_distro_ceph_extra }}/noarch -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://download.ceph.com/keys/release.asc -{% endif %} - -[ceph-extras-source] -name=Ceph Extras Sources -baseurl=http://ceph.com/packages/ceph-extras/rpm/{{ redhat_distro_ceph_extra }}/SRPMS -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://download.ceph.com/keys/release.asc