summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-04-19 11:52:18 -0400
committerGitHub <noreply@github.com>2017-04-19 11:52:18 -0400
commit14dbd7c24df84a0b13a79ce1901de221548442f5 (patch)
tree4fcfac8610cf585a3547e022c0858d0cf48a6556
parent6978114e166ce5fd0737e0c2957a7315d4e5fa41 (diff)
parentdbb9361bb780ed124decca33e447495a6fd7f9dd (diff)
downloadopenshift-14dbd7c24df84a0b13a79ce1901de221548442f5.tar.gz
openshift-14dbd7c24df84a0b13a79ce1901de221548442f5.tar.bz2
openshift-14dbd7c24df84a0b13a79ce1901de221548442f5.tar.xz
openshift-14dbd7c24df84a0b13a79ce1901de221548442f5.zip
Merge pull request #3797 from mwoodson/contiv_empty_dir
added a empty file to the contiv empty dir. This allows contiv to be vendored in git
-rw-r--r--openshift-ansible.spec3
1 files changed, 3 insertions, 0 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 146e08f01..24ae5ba85 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -76,6 +76,9 @@ find -L %{buildroot}%{_datadir}/ansible/%{name}/playbooks -name filter_plugins -
cp -rp roles %{buildroot}%{_datadir}/ansible/%{name}/
# remove contiv role
rm -rf %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv/*
+# touch a file in contiv so that it can be added to SCM's
+touch %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv/.empty_dir
+
# openshift_master_facts symlinks filter_plugins/oo_filters.py from ansible_plugins/filter_plugins
pushd %{buildroot}%{_datadir}/ansible/%{name}/roles/openshift_master_facts/filter_plugins
ln -sf ../../../../../ansible_plugins/filter_plugins/oo_filters.py oo_filters.py