Fix: multiple related images with the same image ref

openstack-k8s-operators · Dec 1, 2023 · 261e532 · 261e532
1 parent 07deae8
commit 261e532
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -134,6 +134,8 @@
       cifmw_tempest_tests_skipped:
       # We don't have a running cinder-volume
         - cinder_tempest_plugin.
+         # TODO(samborka): remove this once we have a running barbican
+        - barbican_tempest_plugin.
         - ServersTestBootFromVolume
         - tempest.api.compute.volumes.test_volumes_list
         - tempest.api.volume.admin

diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
@@ -137,7 +137,7 @@ func SetupDefaults() {
 	novaDefaults := NovaDefaults{
 		APIContainerImageURL:         util.GetEnvVar("RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT", NovaAPIContainerImage),
 		ConductorContainerImageURL:   util.GetEnvVar("RELATED_IMAGE_NOVA_CONDUCTOR_IMAGE_URL_DEFAULT", NovaConductorContainerImage),
-		MetadataContainerImageURL:    util.GetEnvVar("RELATED_IMAGE_NOVA_METADATA_IMAGE_URL_DEFAULT", NovaMetadataContainerImage),
+		MetadataContainerImageURL:    util.GetEnvVar("RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT", NovaMetadataContainerImage),
 		NoVNCContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_NOVA_NOVNC_IMAGE_URL_DEFAULT", NovaNoVNCContainerImage),
 		SchedulerContainerImageURL:   util.GetEnvVar("RELATED_IMAGE_NOVA_SCHEDULER_IMAGE_URL_DEFAULT", NovaSchedulerContainerImage),
 		NovaComputeContainerImageURL: util.GetEnvVar("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", NovaComputeContainerImage),
@@ -155,7 +155,7 @@ func SetupDefaults() {
 	// Acquire environmental defaults and initialize NovaCell defaults with them
 	novaCellDefaults := NovaCellDefaults{
 		ConductorContainerImageURL:   util.GetEnvVar("RELATED_IMAGE_NOVA_CONDUCTOR_IMAGE_URL_DEFAULT", NovaConductorContainerImage),
-		MetadataContainerImageURL:    util.GetEnvVar("RELATED_IMAGE_NOVA_METADATA_IMAGE_URL_DEFAULT", NovaMetadataContainerImage),
+		MetadataContainerImageURL:    util.GetEnvVar("RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT", NovaMetadataContainerImage),
 		NoVNCContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_NOVA_NOVNC_IMAGE_URL_DEFAULT", NovaNoVNCContainerImage),
 		NovaComputeContainerImageURL: util.GetEnvVar("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", NovaComputeContainerImage),
 	}
@@ -171,7 +171,7 @@ func SetupDefaults() {
 
 	// Acquire environmental defaults and initialize NovaMetadata defaults with them
 	novaMetadataDefaults := NovaMetadataDefaults{
-		ContainerImageURL: util.GetEnvVar("RELATED_IMAGE_NOVA_METADATA_IMAGE_URL_DEFAULT", NovaMetadataContainerImage),
+		ContainerImageURL: util.GetEnvVar("RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT", NovaMetadataContainerImage),
 	}
 
 	SetupNovaMetadataDefaults(novaMetadataDefaults)

diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml
@@ -21,5 +21,3 @@ spec:
           value: quay.io/podified-antelope-centos9/openstack-nova-scheduler:current-podified
         - name: RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified
-        - name: RELATED_IMAGE_NOVA_METADATA_IMAGE_URL_DEFAULT
-          value: quay.io/podified-antelope-centos9/openstack-nova-api:current-podified