summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-15 14:28:59 -0400
committerGitHub <noreply@github.com>2016-07-15 14:28:59 -0400
commit56f5b7369dab6202893ebe57fdadaaaa5e99e3b9 (patch)
tree65bde86f47c5c95145b7949468348a9c9fed3793
parentac97e4fb515c349c92c3309329364525eb052441 (diff)
parent479a7fdd55961bcbbfb0d0c9095dcae72577a538 (diff)
downloadopenshift-56f5b7369dab6202893ebe57fdadaaaa5e99e3b9.tar.gz
openshift-56f5b7369dab6202893ebe57fdadaaaa5e99e3b9.tar.bz2
openshift-56f5b7369dab6202893ebe57fdadaaaa5e99e3b9.tar.xz
openshift-56f5b7369dab6202893ebe57fdadaaaa5e99e3b9.zip
Merge pull request #2159 from sdodson/ansible-2x-lookup
Symlink ansible 2.x locations to ansible 1.9 locations
-rw-r--r--openshift-ansible.spec12
1 files changed, 12 insertions, 0 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index f808faeeb..047cfb26e 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -70,6 +70,16 @@ cp -rp filter_plugins %{buildroot}%{_datadir}/ansible_plugins/
# openshift-ansible-lookup-plugins install
cp -rp lookup_plugins %{buildroot}%{_datadir}/ansible_plugins/
+# create symlinks from /usr/share/ansible/plugins/lookup ->
+# /usr/share/ansible_plugins/lookup_plugins
+pushd %{buildroot}%{_datadir}
+mkdir -p ansible/plugins
+pushd ansible/plugins
+ln -s ../../ansible_plugins/lookup_plugins lookup
+ln -s ../../ansible_plugins/filter_plugins filter
+popd
+popd
+
# atomic-openshift-utils install
pushd utils
%{__python} setup.py install --skip-build --root %{buildroot}
@@ -168,6 +178,7 @@ Requires: pyOpenSSL
%files filter-plugins
%{_datadir}/ansible_plugins/filter_plugins
+%{_datadir}/ansible/plugins/filter
# ----------------------------------------------------------------------------------
@@ -183,6 +194,7 @@ BuildArch: noarch
%files lookup-plugins
%{_datadir}/ansible_plugins/lookup_plugins
+%{_datadir}/ansible/plugins/lookup
# ----------------------------------------------------------------------------------
# atomic-openshift-utils subpackage