diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-09-25 18:23:00 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-09-26 09:55:44 -0400 |
| commit | 8066f159814f241613f93432f2e568852d038408 (patch) | |
| tree | 0c2fbaf921cda43d7cf9737b96439a9420f13a3f | |
| parent | 4ceb4bd931fa48b1f666d2258fff763b29bffba8 (diff) | |
| download | openshift-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.
| -rw-r--r-- | playbooks/aws/openshift-cluster/build_ami.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_aws/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/build_ami.yml | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml index fc11205d8..828fa9400 100644 --- a/playbooks/aws/openshift-cluster/build_ami.yml +++ b/playbooks/aws/openshift-cluster/build_ami.yml @@ -47,9 +47,12 @@ groups: nodes name: "{{ instancesout.instances[0].public_dns_name }}" +- hosts: nodes + gather_facts: False + tasks: - name: set the user to perform installation set_fact: - ansible_ssh_user: root + ansible_ssh_user: "{{ openshift_aws_build_ami_ssh_user | default(root) }}" - name: normalize groups include: ../../byo/openshift-cluster/initialize_groups.yml 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 }}" |