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 /playbooks/aws | |
| 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 'playbooks/aws')
4 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml index 56235bc8a..c23bda3a0 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-906240f8 + rhel7_ami: ami-78756d10 user_data_file: user_data.txt vars_files: diff --git a/playbooks/aws/openshift-cluster/vars.online.int.yml b/playbooks/aws/openshift-cluster/vars.online.int.yml index 12f79a9c1..e115615d5 100644 --- a/playbooks/aws/openshift-cluster/vars.online.int.yml +++ b/playbooks/aws/openshift-cluster/vars.online.int.yml @@ -1,5 +1,5 @@ --- -ec2_image: ami-906240f8 +ec2_image: ami-78756d10 ec2_image_name: libra-ops-rhel7* ec2_region: us-east-1 ec2_keypair: mmcgrath_libra diff --git a/playbooks/aws/openshift-cluster/vars.online.prod.yml b/playbooks/aws/openshift-cluster/vars.online.prod.yml index 12f79a9c1..e115615d5 100644 --- a/playbooks/aws/openshift-cluster/vars.online.prod.yml +++ b/playbooks/aws/openshift-cluster/vars.online.prod.yml @@ -1,5 +1,5 @@ --- -ec2_image: ami-906240f8 +ec2_image: ami-78756d10 ec2_image_name: libra-ops-rhel7* ec2_region: us-east-1 ec2_keypair: mmcgrath_libra diff --git a/playbooks/aws/openshift-cluster/vars.online.stage.yml b/playbooks/aws/openshift-cluster/vars.online.stage.yml index 12f79a9c1..e115615d5 100644 --- a/playbooks/aws/openshift-cluster/vars.online.stage.yml +++ b/playbooks/aws/openshift-cluster/vars.online.stage.yml @@ -1,5 +1,5 @@ --- -ec2_image: ami-906240f8 +ec2_image: ami-78756d10 ec2_image_name: libra-ops-rhel7* ec2_region: us-east-1 ec2_keypair: mmcgrath_libra |