Merge pull request #30 from bobuhiro11/support_ubuntu2404

Support Ubuntu24.04.

Author: bobuhiro11

.github/workflows/action.yaml

@@ -7,15 +7,15 @@ on:
   pull_request:
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: hadolint for controller
         run: docker run -e "HADOLINT_IGNORE=DL3008" --rm -i hadolint/hadolint < controller/Dockerfile
       - name: hadolint for compute
         run: docker run -e "HADOLINT_IGNORE=DL3008" --rm -i hadolint/hadolint < compute/Dockerfile
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Remove unused files
         run: |
@@ -29,17 +29,17 @@ jobs:
         with:
           version: v2.17.3
           legacy: true
-      - run: docker-compose --version
+      - run: docker compose version
       - name: Build Images
         run: |
-          docker-compose --file docker-compose.build.yaml up -d
+          docker compose --file docker-compose.build.yaml up -d
           sleep 1800
-          docker-compose --file docker-compose.build.yaml logs -t --tail=100
-          docker-compose --file docker-compose.build.yaml exec -T --user stack controller /bin/test.bash
+          docker compose --file docker-compose.build.yaml logs -t --tail=100
+          docker compose --file docker-compose.build.yaml exec -T --user stack controller /bin/test.bash
           for c in controller compute-1 compute-2; do
-            docker-compose --file docker-compose.build.yaml exec -T $c /bin/bash -c /bin/pre-commit.bash
+            docker compose --file docker-compose.build.yaml exec -T $c /bin/bash -c /bin/pre-commit.bash
           done
-          docker-compose --file docker-compose.build.yaml stop
+          docker compose --file docker-compose.build.yaml stop
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -60,6 +60,6 @@ jobs:
           tag: "${{ github.ref == 'refs/heads/main' && 'latest' || github.sha }}"
         run: |
           sed -i -e "s/image:.*/&:$tag/g" docker-compose.yaml
-          docker-compose up -d
+          docker compose up -d
           sleep 180
-          docker-compose exec -T --user stack controller /bin/test.bash
+          docker compose exec -T --user stack controller /bin/test.bash

compute/Dockerfile

@@ -1,8 +1,8 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 EXPOSE 80 5000 8773 8774 8775 8776 9292
 ENV DEBIAN_FRONTEND=noninteractive
-ENV DEVSTACK_COMMIT=ad029c0e8b66d81889c80d4a68b4654dd169fecf
+ENV DEVSTACK_COMMIT=608ae718fca61e557b315f87900a54a7fb40b07e
 
 ENV OS_REGION_NAME=RegionOne
 ENV OS_PROJECT_DOMAIN_ID=default
@@ -24,7 +24,7 @@ RUN apt-get update \
     systemd \
     sudo \
     iproute2 \
-    lsb \
+    lsb-release \
     git \
     curl \
     init \

controller/Dockerfile

@@ -1,8 +1,8 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 EXPOSE 80 5000 8773 8774 8775 8776 9292
 ENV DEBIAN_FRONTEND=noninteractive
-ENV DEVSTACK_COMMIT=ad029c0e8b66d81889c80d4a68b4654dd169fecf
+ENV DEVSTACK_COMMIT=608ae718fca61e557b315f87900a54a7fb40b07e
 
 ENV OS_REGION_NAME=RegionOne
 ENV OS_PROJECT_DOMAIN_ID=default
@@ -24,7 +24,7 @@ RUN apt-get update \
     systemd \
     sudo \
     iproute2 \
-    lsb \
+    lsb-release \
     git \
     curl \
     init \

test.bash

@@ -12,17 +12,15 @@ openstack network agent list
 net_id=$(openstack network show private -f json 2>/dev/null | jq -r .id | tr -d "\r\n")
 image=$(openstack image list | awk '/cirros/ { print $4 }')
 
-nova boot --image $image --flavor m1.medium \
+openstack server create --image $image --flavor m1.medium \
   --nic net-id=$net_id --availability-zone=nova:controller testvm
 sleep 60
 
 ip=$(openstack server show testvm -f json | jq -r '.addresses.private[0]')
 
-nova list
-nova show testvm | grep ACTIVE
-nova console-log testvm
-nova console-log testvm | grep $ip
-nova delete testvm
+openstack server list
+openstack server show testvm | grep ACTIVE
+openstack server delete testvm
 
 sudo journalctl --no-pager -n 300 -eu devstack@n-cpu
 sudo journalctl --no-pager -n 300 -eu devstack@q-agt