cleanup

playbooks/provisioning/aws/cloudformation/cloudformation_setup.yml

@@ -11,7 +11,13 @@
     vpc_subnet_azs: "{{ lookup('ec2_zones_by_region', ec2_region) }}"
     r53_subdomain: "{{ cluster_id }}.{{ env_id }}.{{ r53_zone }}"
   tasks:
-  - include: tasks/validator.yml
+  - name: 'Validating options'
+    fail:
+      msg: required values not set
+    when: >
+      cluster_id is not defined
+      or env_id is not defined
+      or r53_zone is not defined
 
   - name: Launch the CloudFormation Template
     cloudformation:
@@ -41,13 +47,13 @@
         SubnetAvailabilityZones: "us-east-1d"
         #SubnetAvailabilityZones: "{{ vpc_subnet_azs }}"
         KeyName: libra
-        NumMasters: "{{ os_defaults.masters.count }}"
-        MasterInstanceType: "{{ os_defaults.masters.instance_type }}"
+        NumMasters: "{{ masters.count }}"
+        MasterInstanceType: "{{ masters.instance_type }}"
         MasterImageId: "{{ ec2_image }}"
-        NumInfra: "{{ os_defaults.infra_nodes.count }}"
-        InfraInstanceType: "{{ os_defaults.infra_nodes.instance_type }}"
+        NumInfra: "{{ infra_nodes.count }}"
+        InfraInstanceType: "{{ infra_nodes.instance_type }}"
         InfraImageId: "{{ ec2_image }}"
-        NumNodes: "{{ os_defaults.app_nodes.count }}"
-        NodeInstanceType: "{{ os_defaults.app_nodes.instance_type }}"
+        NumNodes: "{{ app_nodes.count }}"
+        NodeInstanceType: "{{ app_nodes.instance_type }}"
         NodeImageId: "{{ ec2_image }}"
     register: cf_output

playbooks/provisioning/aws/cloudformation/cloudformation_teardown.yml

@@ -8,7 +8,12 @@
   vars_files:
   - vars.yml
   tasks:
-  - include: tasks/validator.yml
+  - name: 'Validating options'
+    fail:
+      msg: required values not set
+    when: >
+      cluster_id is not defined
+      or env_id is not defined
 
   - name: Teardown CloudFormation Template
     cloudformation:

playbooks/provisioning/aws/cloudformation/vars.yml

@@ -0,0 +1,22 @@
+---
+ec2_region: us-east-1
+ec2_image: ami-7e14f213
+api_port: 443
+console_port: 443
+
+identity_providers:
+- name: htpasswd_auth
+  login: true
+  challenge: true
+  kind: HTPasswdPasswordIdentityProvider
+  filename: /etc/origin/master/htpasswd
+
+masters:
+  count: "{{ num_masters | default(3) }}"
+  instance_type: m4.xlarge
+infra_nodes:
+  count: "{{ num_infra_nodes | default(2) }}"
+  instance_type: m4.xlarge
+app_nodes:
+  count: "{{ num_app_nodes | default(2) }}"
+  instance_type: m4.xlarge

playbooks/tasks/teardown.yml

@@ -1,6 +0,0 @@
----
-- name: Launch the CloudFormation Template
-  cloudformation:
-    region: "{{ ec2_region }}"
-    stack_name: openshift-{{ cluster_id }}-{{ env_id }}
-    state: absent

playbooks/tasks/validator.yml

@@ -1,7 +0,0 @@
-- name: 'Validating options'
-  fail:
-    msg: required values not set
-  when: >
-    cluster_id is not defined
-    or env_id is not defined
-    or r53_zone is not defined

playbooks/vars.yml

@@ -1,39 +0,0 @@
----
-ec2_region: us-east-1
-ec2_image: ami-7e14f213
-api_port: 443
-console_port: 443
-
-identity_providers:
-- name: htpasswd_auth
-  login: true
-  challenge: true
-  kind: HTPasswdPasswordIdentityProvider
-  filename: /etc/origin/master/htpasswd
-
-os_defaults:
-  masters:
-    count: "{{ num_masters | default(3) }}"
-    instance_type: m4.xlarge
-    vol_sizes:
-      root: 15
-      docker: 25
-      etcd: 25
-  infra_nodes:
-    count: "{{ num_infra_nodes | default(2) }}"
-    instance_type: m4.xlarge
-    vol_sizes:
-      root: 30
-      docker: 25
-  app_nodes:
-    count: "{{ num_app_nodes | default(2) }}"
-    instance_type: m4.xlarge
-    vol_sizes:
-      root: 30
-      docker: 25
-  hosted:
-    vol_sizes:
-      registry: 30
-      logging: 30
-      metrics: 30
-