Merge pull request #45 from knikolla/fix/small_fixes_2024_03

Small fixes
CCI-MOC · Mar 1, 2024 · 4495eeb · 4495eeb
2 parents c8215fc + 69388f7
commit 4495eeb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,9 @@
 FROM python:3.12
 
 RUN curl https://raw.githubusercontent.com/dumblob/mysql2sqlite/c6ab632eb3ad5798c85f643bd7ecf76ea2d3c63e/mysql2sqlite \
-        --output /bin/mysql2sqlite
+        --output /bin/mysql2sqlite && \
+    chmod +x /bin/mysql2sqlite
+
 
 WORKDIR /app
 COPY requirements.txt ./

diff --git a/k8s/base/cronjob.yaml b/k8s/base/cronjob.yaml
@@ -10,7 +10,7 @@ spec:
         spec:
           containers:
           - name: invoicing-openstack-biweekly
-            image: ghcr.io/cci-moc/openshift-billing-from-db:latest
+            image: ghcr.io/cci-moc/openstack-billing-from-db:latest
             envFrom:
               - secretRef:
                   name: invoicing-openstack-credentials

diff --git a/src/openstack_billing_db/model.py b/src/openstack_billing_db/model.py
@@ -249,8 +249,8 @@ def get_instances(self, project) -> list[Instance]:
                     raise Exception
 
                 pci_name = pci_info[0].get("alias_name", "").lower()
-                if pci_name not in ["a100", "v100", "k80"]:
-                    raise Exception
+                if pci_name not in ["a100", "a100-sxm4", "v100", "k80"]:
+                    raise Exception(f"Invalid pci_name {pci_name}.")
 
                 count = pci_info[0]['count']
                 su_name = f"gpu-{pci_name}.{count}"