diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-05-15 15:17:59 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-05-15 15:17:59 -0400 |
| commit | eff61fdfb6c4611edd932af5de30aa45f8d12f47 (patch) | |
| tree | 81a419ae063dd965ea91a3ca81035e51e05db348 | |
| parent | 1eda40ef2a4df9c5a6a728ac32d74ee1aaca2676 (diff) | |
| parent | 890f2c5d039a501966eedbf8c7bb7b7e9b50464a (diff) | |
| download | openshift-eff61fdfb6c4611edd932af5de30aa45f8d12f47.tar.gz openshift-eff61fdfb6c4611edd932af5de30aa45f8d12f47.tar.bz2 openshift-eff61fdfb6c4611edd932af5de30aa45f8d12f47.tar.xz openshift-eff61fdfb6c4611edd932af5de30aa45f8d12f47.zip | |
Merge pull request #229 from twiest/pr
fixed the openshift-ansible-bin build
| -rw-r--r-- | bin/openshift-ansible-bin.spec | 12 | ||||
| -rw-r--r-- | inventory/openshift-ansible-inventory.spec | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bin/openshift-ansible-bin.spec b/bin/openshift-ansible-bin.spec index 87c0079f2..9336681d1 100644 --- a/bin/openshift-ansible-bin.spec +++ b/bin/openshift-ansible-bin.spec @@ -25,6 +25,12 @@ mkdir -p %{buildroot}/etc/openshift_ansible cp -p ossh oscp opssh opscp ohi %{buildroot}%{_bindir} 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,12 +42,6 @@ cp -p openshift_ansible.conf.example %{buildroot}/etc/openshift_ansible/openshif %config(noreplace) /etc/openshift_ansible/ %changelog -* Fri May 15 2015 Kenny Woodson <kwoodson@redhat.com> 0.0.16-1 -- - -* Fri May 15 2015 Kenny Woodson <kwoodson@redhat.com> 0.0.15-1 -- - * 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) diff --git a/inventory/openshift-ansible-inventory.spec b/inventory/openshift-ansible-inventory.spec index 7ba6e3df1..cd2332549 100644 --- a/inventory/openshift-ansible-inventory.spec +++ b/inventory/openshift-ansible-inventory.spec @@ -57,6 +57,7 @@ cp -p gce/hosts/gce.py %{buildroot}/usr/share/ansible/inventory/gce - Add ansible_connection=local to localhost in inventory (jdetiber@redhat.com) - Adding refresh-cache option and cleanup for pylint. Also updated for aws/hosts/ being added. (kwoodson@redhat.com) + * Thu Mar 26 2015 Thomas Wiest <twiest@redhat.com> 0.0.2-1 - added the ability to have a config file in /etc/openshift_ansible to multi_ec2.py. (twiest@redhat.com) |