Created
August 19, 2016 19:00
-
-
Save chadcatlett/04a55b18c9791d5f76df55b16306e14c to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure.yml b/configure.yml | |
index 3ee5669..7ade25e 100644 | |
--- a/configure.yml | |
+++ b/configure.yml | |
@@ -1,4 +1,4 @@ | |
-- hosts: 127.0.0.1 | |
+- hosts: localhost | |
connection: local | |
gather_facts: False | |
roles: | |
@@ -10,7 +10,7 @@ | |
vars_files: | |
- "{{cluster_dir}}/main.yml" | |
-- hosts: 127.0.0.1 | |
+- hosts: localhost | |
connection: local | |
gather_facts: False | |
roles: | |
@@ -33,7 +33,7 @@ | |
- "api.{{ aws_hosted_zone }}" | |
- "{{ cluster_service_kubernetes_ip }}" | |
-- hosts: 127.0.0.1 | |
+- hosts: localhost | |
connection: local | |
gather_facts: False | |
roles: | |
diff --git a/roles/configure/files/stack-template.json b/roles/configure/files/stack-template.json | |
index fd89ca6..458f24b 100644 | |
--- a/roles/configure/files/stack-template.json | |
+++ b/roles/configure/files/stack-template.json | |
@@ -1350,7 +1350,9 @@ | |
"UserData": { | |
"Ref": "WorkerUserData" | |
}, | |
- "EbsOptimized": true, | |
+ "EbsOptimized": { | |
+ "Ref": "WorkerEbsOptimized" | |
+ }, | |
"BlockDeviceMappings": [ | |
{ | |
"DeviceName": "/dev/xvda", | |
@@ -3338,6 +3340,11 @@ | |
"Type": "Number", | |
"Description": "Number of IOPs to provision for the Worker EC2 Instance root disk." | |
}, | |
+ "WorkerEbsOptimized": { | |
+ "Type": "String", | |
+ "Description": "Enable optimized EBS I/O", | |
+ "Default": "true" | |
+ }, | |
"HostedZone": { | |
"Type": "String", | |
"Description": "DNS zone hosted in Route 53 that will be used to provide DNS resolution for the Kubernetes API to external clients" | |
diff --git a/roles/configure/templates/create-stack.sh.j2 b/roles/configure/templates/create-stack.sh.j2 | |
index b843c5d..cb10cae 100644 | |
--- a/roles/configure/templates/create-stack.sh.j2 | |
+++ b/roles/configure/templates/create-stack.sh.j2 | |
@@ -28,6 +28,7 @@ PARAMETERS=( | |
"ParameterKey=WorkerInstanceCount,ParameterValue={{ worker_instance_count }}" | |
"ParameterKey=WorkerInstanceRootDiskSize,ParameterValue={{ worker_instance_root_disk_size_gb }}" | |
"ParameterKey=WorkerInstanceRootDiskIOPs,ParameterValue={{ worker_instance_root_disk_size_gb * 30 }}" | |
+ "ParameterKey=WorkerEbsOptimized,ParameterValue={{ worker_instance_ebs_optimized|default('true') }}" | |
"ParameterKey=BastionInstanceType,ParameterValue={{ bastion_instance_type }}" | |
"ParameterKey=BastionInstanceRootDiskSize,ParameterValue={{ bastion_instance_root_disk_size_gb }}" | |
"ParameterKey=AggregatorInstanceType,ParameterValue={{ aggregator_instance_type }}" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment