fix bug to get ondemand working

pull/37/head
Minh Doan 6 years ago
parent 3f825b1926
commit 6a4f66bad8
  1. 9
      aws-experiment-launch/create_instances.py
  2. 11
      aws-experiment-launch/utils/user-data.sh

@ -6,19 +6,20 @@ import json
import sys import sys
import threading import threading
import time import time
import enum
from utils import utils, spot_fleet, logger from utils import utils, spot_fleet, logger
LOGGER = logger.getLogger(__file__) LOGGER = logger.getLogger(__file__)
class InstanceResource: class InstanceResource(enum.Enum):
ON_DEMAND = 1 ON_DEMAND = 1
SPOT_INSTANCE = 2 SPOT_INSTANCE = 2
SPOT_FLEET = 3 SPOT_FLEET = 3
def run_one_region_instances(config, region_number, number_of_instances, instance_resource=InstanceResource.ON_DEMAND): def run_one_region_instances(config, region_number, number_of_instances, instance_resource):
region_name = config[region_number][utils.REGION_NAME] region_name = config[region_number][utils.REGION_NAME]
# Create session. # Create session.
session = boto3.Session(region_name=region_name) session = boto3.Session(region_name=region_name)
@ -129,6 +130,8 @@ if __name__ == "__main__":
default='instance_output.txt', help='the file to append or write') default='instance_output.txt', help='the file to append or write')
parser.add_argument('--instance_ids_output', type=str, dest='instance_ids_output', parser.add_argument('--instance_ids_output', type=str, dest='instance_ids_output',
default='instance_ids_output.txt', help='the file to append or write') default='instance_ids_output.txt', help='the file to append or write')
parser.add_argument('--instance_resource', dest='instance_resource', type=InstanceResource,
default=InstanceResource.ON_DEMAND, choices=list(InstanceResource))
parser.add_argument('--append', dest='append', type=bool, default=False, parser.add_argument('--append', dest='append', type=bool, default=False,
help='append to the current instance_output') help='append to the current instance_output')
args = parser.parse_args() args = parser.parse_args()
@ -145,7 +148,7 @@ if __name__ == "__main__":
region_number = region_list[i] region_number = region_list[i]
number_of_instances = num_instance_list[i] number_of_instances = num_instance_list[i]
t = threading.Thread(target=run_for_one_region, args=( t = threading.Thread(target=run_for_one_region, args=(
config, region_number, number_of_instances, InstanceResource.SPOT_FLEET, fout, fout2)) config, region_number, number_of_instances, InstanceResource.ON_DEMAND, fout, fout2))
LOGGER.info("creating thread for region %s" % region_number) LOGGER.info("creating thread for region %s" % region_number)
t.start() t.start()
thread_pool.append(t) thread_pool.append(t)

@ -0,0 +1,11 @@
#!/bin/bash -x
REGION=$(curl 169.254.169.254/latest/meta-data/placement/availability-zone/ | sed 's/[a-z]$//')
#yum update -y #This breaking codedeploy right now
yum install ruby wget -y
cd /home/ec2-user
touch yum-not-updated.txt
wget https://aws-codedeploy-$REGION.s3.amazonaws.com/latest/install
chmod +x ./install
./install auto
mkdir projects
mkdir projects/src
Loading…
Cancel
Save