Merge pull request #4 from openstack-k8s-operators/fix-kolla

kolla no longer respecting KOLLA_CONFIG_FILE
openstack-k8s-operators · Sep 14, 2023 · e42a400 · e42a400
2 parents b6814fc + 73919d2
commit e42a400
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pkg/tempest/job.go b/pkg/tempest/job.go
@@ -16,7 +16,6 @@ func Job(
 ) *batchv1.Job {
 
 	envVars := map[string]env.Setter{}
-	envVars["KOLLA_CONFIG_FILE"] = env.SetValue("/var/lib/config-data/tempest-config.json")
 	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
 	runAsUser := int64(0)
 

diff --git a/pkg/tempest/volumes.go b/pkg/tempest/volumes.go
@@ -73,7 +73,7 @@ func GetVolumeMounts() []corev1.VolumeMount {
 		},
 		{
 			Name:      "config-data",
-			MountPath: "/var/lib/config-data/",
+			MountPath: "/var/lib/kolla/config_files",
 			ReadOnly:  false,
 		},
 	}

diff --git a/templates/tempest/config/tempest-config.json → templates/tempest/config/config.json b/templates/tempest/config/tempest-config.json → templates/tempest/config/config.json
@@ -2,19 +2,19 @@
     "command": "/var/lib/tempest/run_tempest.sh",
     "config_files": [
         {
-            "source": "/var/lib/config-data/clouds.yaml",
+            "source": "/var/lib/kolla/config_files/clouds.yaml",
             "dest": "/var/lib/tempest/external_files/clouds.yaml",
             "owner": "root:tempest",
             "perm": "0640"
         },
         {
-            "source": "/var/lib/config-data/include.txt",
+            "source": "/var/lib/kolla/config_files/include.txt",
             "dest": "/var/lib/tempest/external_files/include.txt",
             "owner": "tempest:tempest",
             "perm": "0640"
         },
         {
-            "source": "/var/lib/config-data/exclude.txt",
+            "source": "/var/lib/kolla/config_files/exclude.txt",
             "dest": "/var/lib/tempest/external_files/exclude.txt",
             "owner": "tempest:tempest",
             "perm": "0640"