summaryrefslogtreecommitdiffstats
path: root/openshift-ansible.spec
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-02 09:49:36 -0500
committerGitHub <noreply@github.com>2017-03-02 09:49:36 -0500
commit170819880c4c9a6d699f4c63537426fa50d487f0 (patch)
tree6d5195821d2eefb57666d0f66e25fa48867fcb87 /openshift-ansible.spec
parent2d52f7c89baae452f3012102ac0f22a071f8f4ce (diff)
parente938fb7339636601073db2a18ddfad3746925910 (diff)
downloadopenshift-170819880c4c9a6d699f4c63537426fa50d487f0.tar.gz
openshift-170819880c4c9a6d699f4c63537426fa50d487f0.tar.bz2
openshift-170819880c4c9a6d699f4c63537426fa50d487f0.tar.xz
openshift-170819880c4c9a6d699f4c63537426fa50d487f0.zip
Merge pull request #3542 from sdodson/remove-contiv-from-rpms
Remove contiv role and playbook from rpm packages
Diffstat (limited to 'openshift-ansible.spec')
-rw-r--r--openshift-ansible.spec4
1 files changed, 4 insertions, 0 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 68eb9ebbb..3c192810f 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -66,6 +66,8 @@ cp inventory/byo/* docs/example-inventories/
# openshift-ansible-playbooks install
cp -rp playbooks %{buildroot}%{_datadir}/ansible/%{name}/
+# remove contiv plabooks
+rm -rf %{buildroot}%{_datadir}/ansible/%{name}/playbooks/adhoc/contiv
# BZ1330091
find -L %{buildroot}%{_datadir}/ansible/%{name}/playbooks -name lookup_plugins -type l -delete
@@ -73,6 +75,8 @@ 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
# 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