add vpc support to ec2 cluster, add more overrides for variables

2 files changed, 33 insertions, 8 deletions

diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 58b4082df..28582c84c 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -1,25 +1,35 @@
 ---
-# TODO: modify machine_image based on deployment_type
 - set_fact:
-    machine_type: "{{ lookup('env', 'ec2_instance_type') | default('m3.large', true) }}"
-    machine_image: "{{ lookup('env', 'ec2_ami') | default(deployment_vars[deployment_type].image, true) }}"
-    machine_region: "{{ lookup('env', 'ec2_region') | default(deployment_vars[deployment_type].region, true) }}"
-    machine_keypair: "{{ lookup('env', 'ec2_keypair')|default('libra', true) }}"
     created_by: "{{ lookup('env', 'LOGNAME')|default(cluster, true) }}"
-    security_group: "{{ lookup('env', 'ec2_security_group')|default('public', true) }}"
     env: "{{ cluster }}"
-    host_type: "{{ type }}"
     env_host_type: "{{ cluster }}-openshift-{{ type }}"
+    host_type: "{{ type }}"
+    machine_type: "{{ lookup('env', 'ec2_instance_type')
+                   | default(deployment_vars[deployment_type].type, true) }}"
+    machine_image: "{{ lookup('env', 'ec2_ami')
+                    | default(deployment_vars[deployment_type].image, true) }}"
+    machine_region: "{{ lookup('env', 'ec2_region')
+                     | default(deployment_vars[deployment_type].region, true) }}"
+    machine_keypair: "{{ lookup('env', 'ec2_keypair')
+                      | default(deployment_vars[deployment_type].keypair, true) }}"
+    machine_subnet: "{{ lookup('env', 'ec2_vpc_subnet')
+                     | default(deployment_vars[deployment_type].vpc_subnet, true) }}"
+    machine_public_ip: "{{ lookup('env', 'ec2_public_ip')
+                        | default(deployment_vars[deployment_type].assign_public_ip, true) }}"
+    security_groups: "{{ lookup('env', 'ec2_security_groups')
+                      | default(deployment_vars[deployment_type].security_groups, true) }}"
 
 - name: Launch instance(s)
   ec2:
     state: present
     region: "{{ machine_region }}"
     keypair: "{{ machine_keypair }}"
-    group: "{{ security_group }}"
+    group: "{{ security_groups }}"
     instance_type: "{{ machine_type }}"
     image: "{{ machine_image }}"
     count: "{{ instances | oo_len }}"
+    vpc_subnet_id: "{{ machine_subnet | default(omit, true) }}"
+    assign_public_ip: "{{ machine_public_ip | default(omit, true) }}"
     wait: yes
     instance_tags:
       created-by: "{{ created_by }}"
diff --git a/playbooks/aws/openshift-cluster/vars.yml b/playbooks/aws/openshift-cluster/vars.yml
index f0df3d6f5..bd6215869 100644
--- a/playbooks/aws/openshift-cluster/vars.yml
+++ b/playbooks/aws/openshift-cluster/vars.yml
@@ -6,15 +6,30 @@ deployment_vars:
     region: us-east-1
     ssh_user: fedora
     sudo: yes
+    keypair: libra
+    type: m3.large
+    security_groups: [ 'public' ]
+    vpc_subnet:
+    assign_public_ip:
   online:
     # private ami
     image: ami-307b3658
     region: us-east-1
     ssh_user: root
     sudo: no
+    keypair: libra
+    type: m3.large
+    security_groups: [ 'public' ]
+    vpc_subnet:
+    assign_public_ip:
   enterprise:
     # rhel-7.1, requires cloud access subscription
     image: ami-10663b78
     region: us-east-1
     ssh_user: ec2-user
     sudo: yes
+    keypair: libra
+    type: m3.large
+    security_groups: [ 'public' ]
+    vpc_subnet:
+    assign_public_ip: