Skip to content

Fix order of grabbing machine details #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2023
Merged

Fix order of grabbing machine details #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions OpenStack-Rabbit-Consumer/rabbit_consumer/message_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion OpenStack-Rabbit-Consumer/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0
2.2.1
4 changes: 2 additions & 2 deletions charts/rabbit-consumer/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"