Skip to content

Commit

Permalink
Merge pull request #3797 from mwoodson/contiv_empty_dir
Browse files Browse the repository at this point in the history
added a empty file to the contiv empty dir. This allows contiv to be vendored in git
  • Loading branch information
sdodson committed Apr 19, 2017
2 parents 6978114 + dbb9361 commit 14dbd7c
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions openshift-ansible.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 14dbd7c

Please sign in to comment.