summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-02 14:22:40 -0500
committerGitHub <noreply@github.com>2017-03-02 14:22:40 -0500
commit1604d8a739bd978cc7bacabae22f2a2c0860ec98 (patch)
tree1492dc79b8e02d41d5a1af3ab1ec81f7f0f952c5
parentfb65e31a4bd623f44a03eb4ac84ceeff16116eaa (diff)
parente3750b9c6d968cfabc8c46e6d3f451e83f59578b (diff)
downloadopenshift-1604d8a739bd978cc7bacabae22f2a2c0860ec98.tar.gz
openshift-1604d8a739bd978cc7bacabae22f2a2c0860ec98.tar.bz2
openshift-1604d8a739bd978cc7bacabae22f2a2c0860ec98.tar.xz
openshift-1604d8a739bd978cc7bacabae22f2a2c0860ec98.zip
Merge pull request #3546 from sdodson/contiv-role-removal
Leave an empty contiv role directory
-rw-r--r--openshift-ansible.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 3c192810f..eefe50348 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -76,7 +76,7 @@ find -L %{buildroot}%{_datadir}/ansible/%{name}/playbooks -name filter_plugins -
# openshift-ansible-roles install
cp -rp roles %{buildroot}%{_datadir}/ansible/%{name}/
# remove contiv role
-rm -rf %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv
+rm -rf %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv/*
# 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