From 858afb085dab78018f90ff17871b83c1dd9ba5bd Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 5 Nov 2017 01:03:05 -0400 Subject: Revert "Bootstrap enhancements." --- playbooks/aws/openshift-cluster/prerequisites.yml | 2 ++ playbooks/aws/openshift-cluster/provision_sec_group.yml | 2 +- playbooks/common/openshift-master/config.yml | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'playbooks') 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 }} -- cgit v1.2.3