Merge pull request #81 from stfc/Fix_hardcoded_arch

Fix archetype being hardcoded to cloud
stfc · Jun 29, 2023 · fd6215f · fd6215f
2 parents b8055b0 + 0bf930e
commit fd6215f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/OpenStack-Rabbit-Consumer/rabbit_consumer/aq_api.py b/OpenStack-Rabbit-Consumer/rabbit_consumer/aq_api.py
@@ -92,7 +92,7 @@ def aq_make(addresses: List[OpenstackAddress], image_meta: AqMetadata) -> None:
         "personality": image_meta.aq_personality,
         "osversion": image_meta.aq_os_version,
         "osname": image_meta.aq_os,
-        "archetype": "cloud",
+        "archetype": image_meta.aq_archetype,
     }
 
     assert all(

diff --git a/OpenStack-Rabbit-Consumer/test/test_aq_api.py b/OpenStack-Rabbit-Consumer/test/test_aq_api.py
@@ -143,7 +143,7 @@ def test_aq_make_calls(config, setup, openstack_address_list, image_metadata):
         "personality": image_metadata.aq_personality,
         "osversion": image_metadata.aq_os_version,
         "osname": image_metadata.aq_os,
-        "archetype": "cloud",
+        "archetype": image_metadata.aq_archetype,
     }
 
     expected_url = f"{domain}/host/{openstack_address_list[0].hostname}/command/make"

diff --git a/OpenStack-Rabbit-Consumer/version.txt b/OpenStack-Rabbit-Consumer/version.txt
@@ -1 +1 @@
-2.3.1
+2.3.2
diff --git a/charts/rabbit-consumer/Chart.yaml b/charts/rabbit-consumer/Chart.yaml
@@ -6,11 +6,11 @@ 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.4.1
+version: 1.4.2
 
 # 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.3.1"
+appVersion: "v2.3.2"