Merge pull request #11121 from jstuever/byoh213

[devel-40] clean up unused playbooks and roles.

Author: sdodson

openshift-ansible.spec

@@ -69,19 +69,13 @@ cp inventory/hosts.* inventory/README.md docs/example-inventories/
 # openshift-ansible-playbooks install
 cp -rp playbooks %{buildroot}%{_datadir}/ansible/%{name}/
 cp -rp test %{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
 find -L %{buildroot}%{_datadir}/ansible/%{name}/playbooks -name filter_plugins -type l -delete
 
 # openshift-ansible-roles install
 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
 
 # Base openshift-ansible files
 %files