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 /playbooks/aws/openshift-cluster | |
| 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 'playbooks/aws/openshift-cluster')
| -rw-r--r-- | playbooks/aws/openshift-cluster/prerequisites.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provision_sec_group.yml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/playbooks/aws/openshift-cluster/prerequisites.yml b/playbooks/aws/openshift-cluster/prerequisites.yml index df77fe3bc..f5eb01b14 100644 --- a/playbooks/aws/openshift-cluster/prerequisites.yml +++ b/playbooks/aws/openshift-cluster/prerequisites.yml @@ -4,5 +4,3 @@ - include: provision_ssh_keypair.yml - include: provision_sec_group.yml - vars: - openshift_aws_node_group_type: compute diff --git a/playbooks/aws/openshift-cluster/provision_sec_group.yml b/playbooks/aws/openshift-cluster/provision_sec_group.yml index 039357adb..7d74a691a 100644 --- a/playbooks/aws/openshift-cluster/provision_sec_group.yml +++ b/playbooks/aws/openshift-cluster/provision_sec_group.yml @@ -6,7 +6,7 @@ connection: local gather_facts: no tasks: - - name: create an instance and prepare for ami + - name: create security groups include_role: name: openshift_aws tasks_from: security_group.yml |