Merge pull request #8 from bobuhiro11/bump_up_devstack

bump up devstack version to latest

Author: bobuhiro11

0001-devstack-disable-dstat.patch

@@ -2,7 +2,7 @@ FROM ubuntu:20.04
 
 EXPOSE 80 5000 8773 8774 8775 8776 9292
 ENV DEBIAN_FRONTEND=noninteractive
-ENV DEVSTACK_COMMIT=a4680766515ed9317b71cfb39cd0d75dc04f3d9c
+ENV DEVSTACK_COMMIT=ab8e51eb49068a8c5004007c18fdfb9b1fcc0954
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
@@ -32,10 +32,8 @@ RUN git clone https://github.com/openstack/devstack.git \
 
 COPY compute/local.conf /opt/stack/devstack/
 COPY compute/devstack.service /etc/systemd/system/
-COPY 0001-devstack-disable-dstat.patch /opt/stack/
 
-RUN patch -d ./devstack -p1 < 0001-devstack-disable-dstat.patch \
-  && systemctl enable devstack
+RUN systemctl enable devstack
 
 STOPSIGNAL SIGRTMIN+3
 CMD [ "/sbin/init" ]

compute/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:20.04
 
 EXPOSE 80 5000 8773 8774 8775 8776 9292
 ENV DEBIAN_FRONTEND=noninteractive
-ENV DEVSTACK_COMMIT=a4680766515ed9317b71cfb39cd0d75dc04f3d9c
+ENV DEVSTACK_COMMIT=ab8e51eb49068a8c5004007c18fdfb9b1fcc0954
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
@@ -32,10 +32,9 @@ RUN git clone https://github.com/openstack/devstack.git \
 
 COPY controller/local.conf /opt/stack/devstack/
 COPY controller/devstack.service /etc/systemd/system/
-COPY 0001-devstack-disable-dstat.patch /opt/stack/
+COPY iscsid.service /etc/systemd/system/
 
-RUN patch -d ./devstack -p1 < 0001-devstack-disable-dstat.patch \
-  && systemctl enable devstack
+RUN systemctl enable devstack
 
 STOPSIGNAL SIGRTMIN+3
 CMD [ "/sbin/init" ]

controller/Dockerfile

@@ -42,6 +42,12 @@ disable_service ovn-controller
 disable_service ovn-northd
 disable_service q-ovn-metadata-agent
 
+# Dsiable dstat
+disable_service dstat
+disable_service memory_tracker
+disable_service peakmem_tracker
+disable_service file_tracker
+
 # Use openvswitch as the ml2 plugin driver
 Q_AGENT=openvswitch
 

controller/local.conf

@@ -0,0 +1,18 @@
+[Unit]
+Description=
+Documentation=
+Wants=
+Before=
+After=
+DefaultDependencies=
+Conflicts=
+Before=
+ConditionVirtualization=
+
+[Service]
+Type=oneshot
+PIDFile=
+ExecStart=/usr/bin/true
+
+[Install]
+WantedBy=