Fixed a bug that deleted all the hosts in a cluster

Clark Perkins · Clark Perkins · commit c47aa8b9e978 · 2016-05-05T14:40:09.000-05:00
diff --git a/setup.py b/setup.py
@@ -92,7 +92,7 @@
     'psutil>=2.1',
     'PyYAML>=3.10',
     'requests>=2.4',
-    'salt>=2015.8.8,<2015.9',
+    'salt>=2015.8.8,!=2015.8.8.2,<2015.9',
     'six>=1.6',
 ]
 
diff --git a/stackdio/api/stacks/tasks.py b/stackdio/api/stacks/tasks.py
@@ -1599,7 +1599,7 @@ def destroy_hosts(stack_id, host_ids=None, delete_hosts=True, delete_security_gr
             else:
                 logger.info('Destroying complete stack: {0!r}'.format(stack))
 
-            result = salt_cloud.destroy_map(stack.generate_cloud_map(), parallel=parallel)
+            result = salt_cloud.destroy_map(stack.generate_cloud_map(), hosts, parallel=parallel)
 
             # Error checking?
             for profile, provider in result.items():
diff --git a/stackdio/api/stacks/utils.py b/stackdio/api/stacks/utils.py
@@ -258,7 +258,7 @@ def launch_map(self, cloud_map, **kwargs):
 
         return salt.utils.cloud.simple_types_filter(ret)
 
-    def destroy_map(self, cloud_map, **kwargs):
+    def destroy_map(self, cloud_map, hosts, **kwargs):
         """
         Destroy the named VMs
         """
@@ -278,7 +278,7 @@ def destroy_map(self, cloud_map, **kwargs):
                 )
 
             try:
-                ret = self._do_destroy(mapper)
+                ret = self._do_destroy(mapper, hosts)
                 # It worked
                 destroyed = True
             except ExtraData as e:
@@ -303,12 +303,14 @@ def destroy_map(self, cloud_map, **kwargs):
 
         return ret
 
-    def _do_destroy(self, mapper):
+    def _do_destroy(self, mapper, hosts):
         """
         Here's where the destroying actually happens
         """
         dmap = mapper.delete_map()
 
+        hostnames = [host.hostname for host in hosts]
+
         # This is pulled from the salt-cloud ec2 driver code.
         msg = 'The following VMs are set to be destroyed:\n'
         names = set()
@@ -317,8 +319,9 @@ def _do_destroy(self, mapper):
             for driver, vms in drivers.items():
                 msg += '    {0}:\n'.format(driver)
                 for name in vms:
-                    msg += '      {0}\n'.format(name)
-                    names.add(name)
+                    if name in hostnames:
+                        msg += '      {0}\n'.format(name)
+                        names.add(name)
 
         if names:
             logger.info(msg)

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@`
`92`	`92`	`'psutil>=2.1',`
`93`	`93`	`'PyYAML>=3.10',`
`94`	`94`	`'requests>=2.4',`
`95`		`- 'salt>=2015.8.8,<2015.9',`
	`95`	`+ 'salt>=2015.8.8,!=2015.8.8.2,<2015.9',`
`96`	`96`	`'six>=1.6',`
`97`	`97`	`]`
`98`	`98`