Bootstrap enhancements.

1 files changed, 12 insertions, 29 deletions

diff --git a/roles/openshift_aws/tasks/provision.yml b/roles/openshift_aws/tasks/provision.yml
index e99017b9f..91538ed5c 100644
--- a/roles/openshift_aws/tasks/provision.yml
+++ b/roles/openshift_aws/tasks/provision.yml
@@ -7,47 +7,30 @@
   name: create s3 bucket for registry
   include: s3.yml
 
-- when: openshift_aws_create_security_groups
-  block:
-  - name: "Create {{ openshift_aws_node_group_type }} security groups"
-    include: security_group.yml
+- include: vpc_and_subnet_id.yml
 
-  - name: "Create {{ openshift_aws_node_group_type }} security groups"
-    include: security_group.yml
-    vars:
-      openshift_aws_node_group_type: infra
-
-- name: create our master internal load balancer
-  include: elb.yml
-  vars:
-    openshift_aws_elb_direction: internal
-    openshift_aws_elb_scheme: internal
-    l_openshift_aws_elb_name: "{{ openshift_aws_elb_name_dict[openshift_aws_node_group_type]['internal'] }}"
-
-- name: create our master external load balancer
+- name: create elbs
   include: elb.yml
+  with_dict: "{{ openshift_aws_elb_dict }}"
   vars:
-    openshift_aws_elb_direction: external
-    openshift_aws_elb_scheme: internet-facing
-    l_openshift_aws_elb_name: "{{ openshift_aws_elb_name_dict[openshift_aws_node_group_type]['external'] }}"
-
-- name: create our infra node external load balancer
-  include: elb.yml
-  vars:
-    l_openshift_aws_elb_name: "{{ openshift_aws_elb_name_dict['infra']['external'] }}"
-    openshift_aws_elb_direction: external
-    openshift_aws_elb_scheme: internet-facing
-    openshift_aws_node_group_type: infra
+    l_elb_security_groups: "{{ openshift_aws_elb_security_groups }}"
+    l_openshift_aws_elb_name_dict: "{{ openshift_aws_elb_name_dict }}"
+  loop_control:
+    loop_var: l_elb_dict_item
 
 - name: include scale group creation for master
   include: build_node_group.yml
+  vars:
+    l_nodes_to_build: "{{ openshift_aws_master_group_config }}"
+    l_launch_config_security_groups: "{{ openshift_aws_launch_config_security_groups }}"
+    l_aws_ami_map: "{{ openshift_aws_ami_map }}"
 
 - name: fetch newly created instances
   ec2_remote_facts:
     region: "{{ openshift_aws_region }}"
     filters:
       "tag:clusterid": "{{ openshift_aws_clusterid }}"
-      "tag:host-type": "{{ openshift_aws_node_group_type }}"
+      "tag:host-type": "master"
       instance-state-name: running
   register: instancesout
   retries: 20