diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 15:57:22 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 15:57:22 -0400 |
| commit | 92c2fef6dc571d6568eb46391d1f9f0c8a1bc8b5 (patch) | |
| tree | 580b32845b21ad78792c009573b4c4850a7b6f87 /openshift-ansible.spec | |
| parent | f450c935f69366a15e078ec11b82bfa0c7130f6d (diff) | |
| parent | e5a8e1589774130c59b166419543709f40a6766e (diff) | |
| download | openshift-92c2fef6dc571d6568eb46391d1f9f0c8a1bc8b5.tar.gz openshift-92c2fef6dc571d6568eb46391d1f9f0c8a1bc8b5.tar.bz2 openshift-92c2fef6dc571d6568eb46391d1f9f0c8a1bc8b5.tar.xz openshift-92c2fef6dc571d6568eb46391d1f9f0c8a1bc8b5.zip | |
Merge pull request #741 from tdawson/2015-10-utils
Add atomic-openshift-utils
Diffstat (limited to 'openshift-ansible.spec')
| -rw-r--r-- | openshift-ansible.spec | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 0c754a7b9..a24ca0c8a 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -26,6 +26,10 @@ for Openshift and Atomic Enterprise. %build +# atomic-openshift-utils install +pushd utils +%{__python} setup.py build +popd %install # Base openshift-ansible install @@ -73,6 +77,13 @@ cp -rp filter_plugins %{buildroot}%{_datadir}/ansible_plugins/ # openshift-ansible-lookup-plugins install cp -rp lookup_plugins %{buildroot}%{_datadir}/ansible_plugins/ +# atomic-openshift-utils install +pushd utils +%{__python} setup.py install --skip-build --root %{buildroot} +# Remove this line once the name change has happened +mv -f %{buildroot}%{_bindir}/oo-install %{buildroot}%{_bindir}/atomic-openshift-installer +popd + # Base openshift-ansible files %files %doc LICENSE.md README* @@ -190,6 +201,28 @@ BuildArch: noarch %files lookup-plugins %{_datadir}/ansible_plugins/lookup_plugins +# ---------------------------------------------------------------------------------- +# atomic-openshift-utils subpackage +# ---------------------------------------------------------------------------------- + +%package -n atomic-openshift-utils +Summary: Atomic OpenShift Utilities +BuildRequires: python-setuptools +Requires: ansible +Requires: python-click +Requires: python-setuptools +Requires: PyYAML +BuildArch: noarch + +%description -n atomic-openshift-utils +Atomic OpenShift Utilities includes + - atomic-openshift-installer + - other utilities + +%files -n atomic-openshift-utils +%{python_sitelib}/ooinstall* +%{_bindir}/atomic-openshift-installer + %changelog * Mon Oct 19 2015 Troy Dawson <tdawson@redhat.com> 3.0.2-1 |