diff options
author | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
---|---|---|
committer | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
commit | 7f7b582a7bc239e69c147b98c8c2512050f12851 (patch) | |
tree | f0701e3ce7a42761e9dfb59218057a46e48a901b /playbooks/aws/ansible-tower | |
parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
parent | 0722304b2f9c94a2f70054e0a3c7feceaedb195c (diff) | |
download | openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.gz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.bz2 openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.xz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.zip |
Merge pull request #158 from openshift/master
Merge master into INT for first v3 INT deploy
Diffstat (limited to 'playbooks/aws/ansible-tower')
-rw-r--r-- | playbooks/aws/ansible-tower/launch.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml index 4c29fa833..56235bc8a 100644 --- a/playbooks/aws/ansible-tower/launch.yml +++ b/playbooks/aws/ansible-tower/launch.yml @@ -6,7 +6,7 @@ vars: inst_region: us-east-1 - rhel7_ami: ami-a24e30ca + rhel7_ami: ami-906240f8 user_data_file: user_data.txt vars_files: |