diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-11-05 01:25:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-05 01:25:30 -0400 |
| commit | bbea54dca12e8796764629b88c1faf596b2f5840 (patch) | |
| tree | a577663c65a6eba7ec60e00e2ae0e023359e143e /playbooks | |
| parent | 76f4f47c2fac8f2c1df8bf300069116f0dcfbf0e (diff) | |
| parent | 858afb085dab78018f90ff17871b83c1dd9ba5bd (diff) | |
| download | openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.gz openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.bz2 openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.xz openshift-bbea54dca12e8796764629b88c1faf596b2f5840.zip | |
Merge pull request #6015 from openshift/revert-6006-elb-v2
Revert "Bootstrap enhancements."
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/aws/openshift-cluster/prerequisites.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provision_sec_group.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/playbooks/aws/openshift-cluster/prerequisites.yml b/playbooks/aws/openshift-cluster/prerequisites.yml index f5eb01b14..df77fe3bc 100644 --- a/playbooks/aws/openshift-cluster/prerequisites.yml +++ b/playbooks/aws/openshift-cluster/prerequisites.yml @@ -4,3 +4,5 @@ - 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 7d74a691a..039357adb 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 security groups + - name: create an instance and prepare for ami include_role: name: openshift_aws tasks_from: security_group.yml diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index f32073f09..b359919ba 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -212,13 +212,6 @@ tasks_from: master when: openshift_use_kuryr | default(false) | bool - - name: Setup the compute and infra node config maps - include_role: - name: openshift_node_bootstrap_configmap - tasks_from: standard.yml - when: openshift_master_bootstrap_enabled | default(false) | bool - run_once: True - post_tasks: - name: Create group for deployment type group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }} |