Skip to content
Open
14 changes: 9 additions & 5 deletions cloudlift/config/environment_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ def _create_config(self):
"Private Subnet 2 CIDR", default=list(vpc_cidr.subnets(new_prefix=22))[3])
cluster_min_instances = prompt("Min instances in cluster", default=1)
cluster_max_instances = prompt("Max instances in cluster", default=5)
cluster_instance_type = prompt("Instance type", default='m5.xlarge')
spot_allocation_strategy = prompt("Spot Allocation Strategy capacity-optimized/lowest-price", default='capacity-optimized')
cluster_instance_types = prompt("Instance types in comma delimited list, \nFor On-Demand instance type only first instance type will be considered", default='t2.micro,m5.xlarge')
cluster_instance_types = cluster_instance_types.split(",")
key_name = prompt("SSH key name")
notifications_arn = prompt("Notification SNS ARN")
ssl_certificate_arn = prompt("SSL certificate ARN")
Expand Down Expand Up @@ -161,8 +163,9 @@ def _create_config(self):
"cluster": {
"min_instances": cluster_min_instances,
"max_instances": cluster_max_instances,
"instance_type": cluster_instance_type,
"key_name": key_name
"instance_types": cluster_instance_types,
"key_name": key_name,
"spot_allocation_strategy": spot_allocation_strategy
},
"environment": {
"notifications_arn": notifications_arn,
Expand Down Expand Up @@ -247,13 +250,14 @@ def _validate_changes(self, configuration):
"properties": {
"min_instances": {"type": "integer"},
"max_instances": {"type": "integer"},
"instance_type": {"type": "string"},
"instance_types": {"type": "array"},
"key_name": {"type": "string"},
"spot_allocation_strategy": {"type": "string"}
},
"required": [
"min_instances",
"max_instances",
"instance_type",
"instance_types",
"key_name"
]
},
Expand Down
6 changes: 5 additions & 1 deletion cloudlift/config/service_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ def _validate_changes(self, configuration):
{"type": "string"},
{"type": "null"}
]
},
"interruptable": {
"type": "boolean"
}
},
"required": ["memory_reservation", "command"]
Expand Down Expand Up @@ -237,7 +240,8 @@ def _default_service_configuration(self):
u'health_check_path': u'/elb-check'
},
u'memory_reservation': 1000,
u'command': None
u'command': None,
u'interruptable': False
}
}
}
14 changes: 14 additions & 0 deletions cloudlift/deployment/banner/production-banner.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
RED='\033[1;31m'
NC='\033[0m' # No Color
printf "
************************************************************************************
** ${RED}You're on${NC} **
** ${RED} ____ ____ ___ ____ _ _ ____ _____ ___ ___ _ _ ${NC} **
** ${RED}| _ \ | _ \ / _ \ | _ \ | | | | / ___| |_ _| |_ _| / _ \ | \ | |${NC} **
** ${RED}| |_)| | |_) | | | | | | | | | | | | | | | | | | | | | | | | \| |${NC} **
** ${RED}| __/ | _ < | |_| | | |_| | | |_| | | |___ | | | | | |_| | | |\ |${NC} **
** ${RED}|_| |_| \_\ \___/ |____/ \___/ \____| |_| |___| \___/ |_| \_|${NC} **
** **
************************************************************************************
"
14 changes: 14 additions & 0 deletions cloudlift/deployment/banner/sandbox-banner.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
yellow='\033[1;33m'
NC='\033[0m' # No Color
printf "
*****************************************************************************
** ${yellow}You're on${NC} **
** ${yellow} ____ _ _ _ ____ ____ ___ __ __ ${NC} **
** ${yellow}/ ___| / \ | \ | | | _ \ | __ ) / _ \ \ \/ / ${NC} **
** ${yellow}\___ \ / _ \ | \| | | | | | | _ \ | | | \ \ / ${NC} **
** ${yellow} ___) / / ___ \ | |\ | | |_| | | |_) | | |_| / / \ ${NC} **
** ${yellow}|____/ /_/ \_| |_| \_| |____/ |____/ \___/ /_/\_\ ${NC} **
** **
*****************************************************************************
"
14 changes: 14 additions & 0 deletions cloudlift/deployment/banner/staging-banner.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
green='\033[1;32m'
NC='\033[0m' # No Color
printf "
*****************************************************************************
** ${green}You're on${NC} **
** ${green} ____ _____ _ ____ ___ _ _ ____ ${NC} **
** ${green}/ ___| |_ _| / \ / ___| |_ _| | \ | | / ___|${NC} **
** ${green}\___ \ | | / _ \ | | _ | | | \| | | | _ ${NC} **
** ${green} ___) | | | / ___ \ | |_| | | | | |\ | | |_| |${NC} **
** ${green}|____/ |_| /_/ \_\ \____| |___| |_| \_| \____|${NC} **
** **
*****************************************************************************
"
15 changes: 15 additions & 0 deletions cloudlift/deployment/banner/unicorn-banner.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

blue='\033[1;32m'
NC='\033[0m' # No Color
printf "
*****************************************************************************
** ${blue}You're on${NC} **
** ${blue} _ _ _ _ ___ ____ ___ ____ _ _ ${NC} **
** ${blue}| | | | | \ | | |_ _| / ___/ / _ \ | _ \ | \ | |${NC} **
** ${blue}| | | | | \| | | | | | | | | | | |_) | | \| |${NC} **
** ${blue}| |_| | | |\ | | | | |___ | |_| | | _ < | |\ |${NC} **
** ${blue} \___/ |_| \_| |___| \____\ \___/ |_| \_| |_| \_|${NC} **
** **
*****************************************************************************
"
Loading