diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-09-27 08:28:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-27 08:28:50 -0400 |
commit | 1ab97938845c00119c3e88d58b33ae6cbd8f97fd (patch) | |
tree | 6f352f4a8d2b2466661dcc7f2b2b4f41bdfa42ed /roles | |
parent | 54c41923ed30ba7e46dd12d15157195feca093a6 (diff) | |
parent | 8066f159814f241613f93432f2e568852d038408 (diff) | |
download | openshift-1ab97938845c00119c3e88d58b33ae6cbd8f97fd.tar.gz openshift-1ab97938845c00119c3e88d58b33ae6cbd8f97fd.tar.bz2 openshift-1ab97938845c00119c3e88d58b33ae6cbd8f97fd.tar.xz openshift-1ab97938845c00119c3e88d58b33ae6cbd8f97fd.zip |
Merge pull request #5532 from mgugino-upstream-stage/centos-ami-provision
More variables in AWS provisioning plays
Diffstat (limited to 'roles')
-rw-r--r-- | roles/openshift_aws/defaults/main.yml | 1 | ||||
-rw-r--r-- | roles/openshift_aws/tasks/build_ami.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml index 4e7f54f79..4d88db037 100644 --- a/roles/openshift_aws/defaults/main.yml +++ b/roles/openshift_aws/defaults/main.yml @@ -13,6 +13,7 @@ openshift_aws_wait_for_ssh: True openshift_aws_clusterid: default openshift_aws_region: us-east-1 openshift_aws_vpc_name: "{{ openshift_aws_clusterid }}" +openshift_aws_build_ami_group: "{{ openshift_aws_clusterid }}" openshift_aws_iam_cert_name: "{{ openshift_aws_clusterid }}-master-external" openshift_aws_iam_cert_path: '' diff --git a/roles/openshift_aws/tasks/build_ami.yml b/roles/openshift_aws/tasks/build_ami.yml index 8d4e5ac43..48555e5da 100644 --- a/roles/openshift_aws/tasks/build_ami.yml +++ b/roles/openshift_aws/tasks/build_ami.yml @@ -31,7 +31,7 @@ assign_public_ip: yes region: "{{ openshift_aws_region }}" key_name: "{{ openshift_aws_ssh_key_name }}" - group: "{{ openshift_aws_clusterid }}" + group: "{{ openshift_aws_build_ami_group }}" instance_type: m4.xlarge vpc_subnet_id: "{{ subnetout.subnets[0].id }}" image: "{{ openshift_aws_base_ami }}" |