diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 21:52:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-03 21:52:09 -0700 |
commit | 86643ad6e12d10803fdae5e103a7392795c35a8d (patch) | |
tree | 71562b1156b49e812c30f660cf140894267aec0a /roles/openshift_aws/tasks/provision_instance.yml | |
parent | 413fe019b488b75909629c68949ba693004afd6a (diff) | |
parent | 983fdade31c57654854cce3c5340e8bf5a7838e7 (diff) | |
download | openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.gz openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.bz2 openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.xz openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.zip |
Merge pull request #6006 from mgugino-upstream-stage/elb-v2
Automatic merge from submit-queue.
Bootstrap enhancements.
This includes the elb work.
Diffstat (limited to 'roles/openshift_aws/tasks/provision_instance.yml')
-rw-r--r-- | roles/openshift_aws/tasks/provision_instance.yml | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/roles/openshift_aws/tasks/provision_instance.yml b/roles/openshift_aws/tasks/provision_instance.yml index 25ae6ce1c..3349acb7a 100644 --- a/roles/openshift_aws/tasks/provision_instance.yml +++ b/roles/openshift_aws/tasks/provision_instance.yml @@ -3,20 +3,7 @@ set_fact: openshift_node_bootstrap: True -- name: query vpc - ec2_vpc_net_facts: - region: "{{ openshift_aws_region }}" - filters: - 'tag:Name': "{{ openshift_aws_vpc_name }}" - register: vpcout - -- name: fetch the default subnet id - ec2_vpc_subnet_facts: - region: "{{ openshift_aws_region }}" - filters: - "tag:Name": "{{ openshift_aws_subnet_name }}" - vpc-id: "{{ vpcout.vpcs[0].id }}" - register: subnetout +- include: vpc_and_subnet_id.yml - name: create instance for ami creation ec2: |