From: Ken Dreyer Date: Fri, 8 Jul 2016 22:09:32 +0000 (-0600) Subject: ceph-common: fix "Red Hat Ceph Storage" product name X-Git-Tag: v1.0.6~69^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F872%2Fhead;p=ceph-ansible.git ceph-common: fix "Red Hat Ceph Storage" product name Standardize on the name "Red Hat Ceph Storage" everywhere --- diff --git a/roles/ceph-common/tasks/checks/check_system.yml b/roles/ceph-common/tasks/checks/check_system.yml index 55458b129..18bd80198 100644 --- a/roles/ceph-common/tasks/checks/check_system.yml +++ b/roles/ceph-common/tasks/checks/check_system.yml @@ -16,7 +16,7 @@ - name: fail on unsupported distribution for red hat storage fail: - msg: "Distribution not supported {{ ansible_distribution_version }} by Red Hat Storage, only RHEL 7.1" + msg: "Distribution not supported {{ ansible_distribution_version }} by Red Hat Ceph Storage, only RHEL 7.1" when: - ceph_stable_rh_storage - ansible_distribution_version | version_compare('7.1', '<') diff --git a/roles/ceph-common/templates/redhat_storage_repo.j2 b/roles/ceph-common/templates/redhat_storage_repo.j2 index 7d61b585c..2ee20b2fb 100644 --- a/roles/ceph-common/templates/redhat_storage_repo.j2 +++ b/roles/ceph-common/templates/redhat_storage_repo.j2 @@ -1,6 +1,6 @@ # {{ ansible_managed }} [rh_storage_mon] -name=Red Hat Storage Ceph - local packages for Ceph +name=Red Hat Ceph Storage - local packages for Ceph baseurl=file://{{ ceph_stable_rh_storage_repository_path }}/MON enabled=1 gpgcheck=1 @@ -8,7 +8,7 @@ type=rpm-md priority=1 [rh_storage_osd] -name=Red Hat Storage Ceph - local packages for Ceph +name=Red Hat Ceph Storage - local packages for Ceph baseurl=file://{{ ceph_stable_rh_storage_repository_path }}/OSD enabled=1 gpgcheck=1 @@ -16,7 +16,7 @@ type=rpm-md priority=1 [rh_storage_tools] -name=Red Hat Storage Ceph - assorted tools +name=Red Hat Ceph Storage - assorted tools baseurl=file://{{ ceph_stable_rh_storage_repository_path }}/Tools enabled=1 gpgcheck=1