diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2016-09-29 07:32:56 -0700 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2016-09-29 07:43:54 -0700 |
| commit | ba823255fcde17124b6dcc447bb00bc241346312 (patch) | |
| tree | f37bc298467beadf3e1d4a722702a346f14de75c /openshift-ansible.spec | |
| parent | be3a68ae520d518daef2e35553c28cd150d3c344 (diff) | |
| download | openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.gz openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.bz2 openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.xz openshift-ba823255fcde17124b6dcc447bb00bc241346312.zip | |
Fix conflicts in spec file
Diffstat (limited to 'openshift-ansible.spec')
| -rw-r--r-- | openshift-ansible.spec | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 5e297cb2a..d31447d7a 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -70,6 +70,9 @@ cp -rp filter_plugins %{buildroot}%{_datadir}/ansible_plugins/ # openshift-ansible-lookup-plugins install cp -rp lookup_plugins %{buildroot}%{_datadir}/ansible_plugins/ +# openshift-ansible-callback-plugins install +cp -rp callback_plugins %{buildroot}%{_datadir}/ansible_plugins/ + # create symlinks from /usr/share/ansible/plugins/lookup -> # /usr/share/ansible_plugins/lookup_plugins pushd %{buildroot}%{_datadir} @@ -77,6 +80,7 @@ mkdir -p ansible/plugins pushd ansible/plugins ln -s ../../ansible_plugins/lookup_plugins lookup ln -s ../../ansible_plugins/filter_plugins filter +ln -s ../../ansible_plugins/callback_plugins callback popd popd @@ -89,6 +93,7 @@ mkdir -p %{buildroot}%{_datadir}/atomic-openshift-utils/ cp etc/ansible.cfg %{buildroot}%{_datadir}/atomic-openshift-utils/ansible.cfg mkdir -p %{buildroot}%{_mandir}/man1/ cp -v docs/man/man1/atomic-openshift-installer.1 %{buildroot}%{_mandir}/man1/ +cp etc/ansible-quiet.cfg %{buildroot}%{_datadir}/atomic-openshift-utils/ansible-quiet.cfg popd # Base openshift-ansible files @@ -122,6 +127,7 @@ Requires: %{name} = %{version} Requires: %{name}-roles = %{version} Requires: %{name}-lookup-plugins = %{version} Requires: %{name}-filter-plugins = %{version} +Requires: %{name}-callback-plugins = %{version} BuildArch: noarch %description playbooks @@ -158,6 +164,7 @@ Summary: Openshift and Atomic Enterprise Ansible roles Requires: %{name} = %{version} Requires: %{name}-lookup-plugins = %{version} Requires: %{name}-filter-plugins = %{version} +Requires: %{name}-callback-plugins = %{version} BuildArch: noarch %description roles @@ -199,6 +206,22 @@ BuildArch: noarch %{_datadir}/ansible_plugins/lookup_plugins %{_datadir}/ansible/plugins/lookup + +# ---------------------------------------------------------------------------------- +# openshift-ansible-callback-plugins subpackage +# ---------------------------------------------------------------------------------- +%package callback-plugins +Summary: Openshift and Atomic Enterprise Ansible callback plugins +Requires: %{name} = %{version} +BuildArch: noarch + +%description callback-plugins +%{summary}. + +%files callback-plugins +%{_datadir}/ansible_plugins/callback_plugins +%{_datadir}/ansible/plugins/callback + # ---------------------------------------------------------------------------------- # atomic-openshift-utils subpackage # ---------------------------------------------------------------------------------- @@ -222,6 +245,8 @@ Atomic OpenShift Utilities includes %{_bindir}/atomic-openshift-installer %{_datadir}/atomic-openshift-utils/ansible.cfg %{_mandir}/man1/* +%{_datadir}/atomic-openshift-utils/ansible-quiet.cfg + %changelog * Mon Sep 26 2016 Scott Dodson <sdodson@redhat.com> 3.4.2-1 |