diff options
author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-05-12 16:46:29 -0400 |
---|---|---|
committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-05-12 16:46:29 -0400 |
commit | 077817cd2ff63d754661dddba31abcd5fbbb2b6f (patch) | |
tree | ee3f089fbfe9de079f004569d6db93fc47186cae | |
parent | e7950be055cc672111cff4dc8446e33b5e2a7cf0 (diff) | |
parent | 4e3972b89a0954b55e7b10917757e07b9e610c3a (diff) | |
download | openshift-077817cd2ff63d754661dddba31abcd5fbbb2b6f.tar.gz openshift-077817cd2ff63d754661dddba31abcd5fbbb2b6f.tar.bz2 openshift-077817cd2ff63d754661dddba31abcd5fbbb2b6f.tar.xz openshift-077817cd2ff63d754661dddba31abcd5fbbb2b6f.zip |
Merge pull request #222 from twiest/pr
removed ec2.ini from the openshift-ansible-inventory.spec file so that we're not dictating what the ec2.ini file should look like.
-rw-r--r-- | inventory/openshift-ansible-inventory.spec | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/inventory/openshift-ansible-inventory.spec b/inventory/openshift-ansible-inventory.spec index e6bf37988..c1b066afb 100644 --- a/inventory/openshift-ansible-inventory.spec +++ b/inventory/openshift-ansible-inventory.spec @@ -25,7 +25,7 @@ mkdir -p %{buildroot}/usr/share/ansible/inventory/gce cp -p multi_ec2.py %{buildroot}/usr/share/ansible/inventory cp -p multi_ec2.yaml.example %{buildroot}/etc/ansible/multi_ec2.yaml -cp -p aws/hosts/ec2.py aws/hosts/ec2.ini %{buildroot}/usr/share/ansible/inventory/aws +cp -p aws/hosts/ec2.py %{buildroot}/usr/share/ansible/inventory/aws cp -p gce/hosts/gce.py %{buildroot}/usr/share/ansible/inventory/gce %files @@ -33,7 +33,6 @@ cp -p gce/hosts/gce.py %{buildroot}/usr/share/ansible/inventory/gce %dir /usr/share/ansible/inventory /usr/share/ansible/inventory/multi_ec2.py* /usr/share/ansible/inventory/aws/ec2.py* -%config(noreplace) /usr/share/ansible/inventory/aws/ec2.ini /usr/share/ansible/inventory/gce/gce.py* %changelog |