]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rpm: ship rhcs.yaml.sample as all.yml.sample on RHEL 1900/head
authorKen Dreyer <kdreyer@redhat.com>
Thu, 14 Sep 2017 20:42:53 +0000 (14:42 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Thu, 14 Sep 2017 20:45:34 +0000 (14:45 -0600)
When building the RPM on RHEL, we will ship the conents of the
`rhcs.yml.sample` file into `all.yml.sample`.

The purpose of this change is to expose "all.yml.sample" to both
upstream and downstream users, so they use the same file name (but with
different contents.)

ceph-ansible.spec.in

index d56a96a4eaf4ed62fe4f35961c74b0c8df98ff28..5cdef96278a752957e02096fcfe1ecf63dd7afa7 100644 (file)
@@ -44,12 +44,9 @@ pushd %{buildroot}%{_datarootdir}/ceph-ansible
   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}
-    # Ship the upstream config (delete RHCS)
-    rm group_vars/rhcs.yml.sample
-  %else
-    # Ship only the Red Hat Ceph Storage config (delete upstream)
-    rm group_vars/all.yml.sample
+  %if ! 0%{?fedora} && ! 0%{?centos}
+    # Ship only the Red Hat Ceph Storage config (overwrite upstream settings)
+    cp group_vars/rhcs.yml.sample group_vars/all.yml.sample
   %endif
 popd