summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-25 18:23:00 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-26 09:55:44 -0400
commit8066f159814f241613f93432f2e568852d038408 (patch)
tree0c2fbaf921cda43d7cf9737b96439a9420f13a3f /roles
parent4ceb4bd931fa48b1f666d2258fff763b29bffba8 (diff)
downloadopenshift-8066f159814f241613f93432f2e568852d038408.tar.gz
openshift-8066f159814f241613f93432f2e568852d038408.tar.bz2
openshift-8066f159814f241613f93432f2e568852d038408.tar.xz
openshift-8066f159814f241613f93432f2e568852d038408.zip
More variables in AWS provisioning plays
This commit adds more optional variables to provision hosts in AWS environments. These changes allow provisioning instances that utilize an ssh_user other than root.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_aws/defaults/main.yml1
-rw-r--r--roles/openshift_aws/tasks/build_ami.yml2
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 }}"