Merge pull request #6 from Shrobs/remove-cluster-creation

removing cluster default creation and removal
Shrobs · Mar 1, 2017 · abdb5b4 · abdb5b4
2 parents 56bc307 + accd41b
commit abdb5b4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 31 deletions.
diff --git a/climulon/handlers/decommission.py b/climulon/handlers/decommission.py
@@ -92,10 +92,4 @@ def run_decommission(conf, stackSubset):
                     )
                 print("Services deleted")
 
-                print("Deleting ECS cluster...")
-                client.delete_cluster(
-                    cluster=configParams["EcsClusterName"]
-                )
-                print("ECS cluster deleted")
-
     print("Decommission complete")
diff --git a/climulon/handlers/exceptions.py b/climulon/handlers/exceptions.py
@@ -120,13 +120,6 @@ def __init__(self, taskDefName):
                         "family named : %s" % (taskDefName))
 
 
-class EcsClusterExistsError(BasicException):
-
-    def __init__(self, EcsClusterName):
-        self.message = ("ERROR : There is already an ECS cluster with the name"
-                        " : %s" % (EcsClusterName))
-
-
 class StackUnresolvedDependency(UnresolvedDependency):
 
     def __init__(self, stackName, missingRefs):

diff --git a/climulon/handlers/provision.py b/climulon/handlers/provision.py
@@ -101,16 +101,6 @@ def run_provision(conf, stackSubset, timeout, dry_run):
                         if value == task:
                             raise TaskDefExistsError(task)
 
-            # Checking if there is an ECS cluster with same name
-            print("Checking if there is an ECS cluster with current name")
-            checkClusterResponse = client.describe_clusters(
-                clusters=[configParams["EcsClusterName"]]
-            )
-            if (checkClusterResponse["clusters"] != [] and
-                    checkClusterResponse["clusters"][0]["status"] !=
-                    "INACTIVE"):
-                raise EcsClusterExistsError(configParams["EcsClusterName"])
-
     print("Checks complete, ready for provisioning")
 
     if dry_run is True:
@@ -254,14 +244,6 @@ def run_provision(conf, stackSubset, timeout, dry_run):
 
             client = boto3.client('ecs', region_name=template["StackRegion"])
 
-            # Create the cluster in ECS
-            print("Creating cluster : %s" %
-                  (configParams["EcsClusterName"]))
-            client.create_cluster(
-                clusterName=configParams["EcsClusterName"])
-            print("Cluster created : %s" %
-                  (configParams["EcsClusterName"]))
-
             servicesContent = services.fill_service_templates(
                 servicesContent, configParams)