Merge pull request #79 from stfc/Fix_machine_details_order

Fix order of grabbing machine details

Author: jacob-ward

OpenStack-Rabbit-Consumer/rabbit_consumer/message_consumer.py

@@ -75,15 +75,16 @@ def delete_machine(
     # of deletion orders which it enforces...
 
     hostname = aq_api.search_host_by_machine(machine_name)
-    machine_details = aq_api.get_machine_details(machine_name)
-    # We have to clean-up all the interfaces and addresses first
     if hostname:
         if aq_api.check_host_exists(hostname):
             # This is a different hostname to the one we have in the message
             # so, we need to delete it
             logger.info("Host exists for %s. Deleting old", hostname)
             aq_api.delete_host(hostname)
 
+        # We have to clean-up all the interfaces and addresses first
+        machine_details = aq_api.get_machine_details(machine_name)
+
         # First delete the interfaces
         ipv4_address = socket.gethostbyname(hostname)
         if ipv4_address in machine_details:

OpenStack-Rabbit-Consumer/version.txt

@@ -1 +1 @@
-2.2.0
+2.2.1

charts/rabbit-consumer/Chart.yaml

@@ -6,10 +6,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.0
+version: 1.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0"
+appVersion: "v2.2.1"