diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-05-21 14:11:25 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-05-21 14:11:25 -0500 |
| commit | 124ca40c134a40b2e6823ab3c4bfe329580d7eaa (patch) | |
| tree | 6cbc6c67bcefea2ed964c4fbda0aa47c3a2b067c /bin/openshift-ansible-bin.spec | |
| parent | 803b9191f1a3a2bffe94528a8a5cd82adf6f3a42 (diff) | |
| parent | c3bd6a3489dd0473334543024efa2c3c96ba8be2 (diff) | |
| download | openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.gz openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.bz2 openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.xz openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.zip | |
Merge branch 'int' into stg
Diffstat (limited to 'bin/openshift-ansible-bin.spec')
| -rw-r--r-- | bin/openshift-ansible-bin.spec | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/bin/openshift-ansible-bin.spec b/bin/openshift-ansible-bin.spec index 29aaff9ae..884d4eb0a 100644 --- a/bin/openshift-ansible-bin.spec +++ b/bin/openshift-ansible-bin.spec @@ -1,6 +1,6 @@ Summary: OpenShift Ansible Scripts for working with metadata hosts Name: openshift-ansible-bin -Version: 0.0.12 +Version: 0.0.17 Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/openshift/openshift-ansible @@ -24,7 +24,13 @@ mkdir -p %{buildroot}/etc/bash_completion.d mkdir -p %{buildroot}/etc/openshift_ansible cp -p ossh oscp opssh opscp ohi %{buildroot}%{_bindir} -cp -p openshift_ansible/* %{buildroot}%{python_sitelib}/openshift_ansible +cp -pP openshift_ansible/* %{buildroot}%{python_sitelib}/openshift_ansible + +# Make it so we can load multi_ec2.py as a library. +rm %{buildroot}%{python_sitelib}/openshift_ansible/multi_ec2.py* +ln -sf /usr/share/ansible/inventory/multi_ec2.py %{buildroot}%{python_sitelib}/openshift_ansible/multi_ec2.py +ln -sf /usr/share/ansible/inventory/multi_ec2.pyc %{buildroot}%{python_sitelib}/openshift_ansible/multi_ec2.pyc + cp -p ossh_bash_completion %{buildroot}/etc/bash_completion.d cp -p openshift_ansible.conf.example %{buildroot}/etc/openshift_ansible/openshift_ansible.conf @@ -36,6 +42,15 @@ cp -p openshift_ansible.conf.example %{buildroot}/etc/openshift_ansible/openshif %config(noreplace) /etc/openshift_ansible/ %changelog +* Fri May 15 2015 Thomas Wiest <twiest@redhat.com> 0.0.17-1 +- fixed the openshift-ansible-bin build (twiest@redhat.com) + +* Fri May 15 2015 Thomas Wiest <twiest@redhat.com> 0.0.14-1 +- Command line tools import multi_ec2 as lib (kwoodson@redhat.com) +- Adding cache location for multi ec2 (kwoodson@redhat.com) +* Thu May 07 2015 Thomas Wiest <twiest@redhat.com> 0.0.13-1 +- added '-e all' to ohi and fixed pylint errors. (twiest@redhat.com) + * Tue May 05 2015 Thomas Wiest <twiest@redhat.com> 0.0.12-1 - fixed opssh and opscp to allow just environment or just host-type. (twiest@redhat.com) |