Skip to content

Commit 5e947a1

Browse files
bobuhiro11bobuhiro11
authored
Merge pull request #3 from bobuhiro11/sched_gh_action
run gh actions daily
2 parents b4f07f5 + 62a4354 commit 5e947a1

7 files changed

Lines changed: 72 additions & 75 deletions

File tree

‎.github/workflows/action.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: action
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches: [main]
5+
schedule:
6+
- cron: '0 0 * * *'
7+
pull_request:
38
jobs:
49
lint:
510
runs-on: ubuntu-20.04

‎0001-devstack-disable-ovs.patch‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
diff --git a/lib/databases/mysql b/lib/databases/mysql
2-
index d4969d71..fd26b2bc 100644
2+
index b292da25..8514dd22 100644
33
--- a/lib/databases/mysql
44
+++ b/lib/databases/mysql
5-
@@ -84,7 +84,7 @@ function configure_database_mysql {
6-
fi
7-
8-
# Start mysql-server
5+
@@ -90,7 +90,7 @@ function configure_database_mysql {
6+
iniset -sudo $my_conf mysqld bind-address "$(ipv6_unquote $SERVICE_LISTEN_ADDRESS)"
7+
8+
# (Re)Start mysql-server
99
- if is_fedora || is_suse; then
1010
+ if is_fedora || is_suse || is_ubuntu; then
1111
# service is not started by default
1212
start_service $MYSQL_SERVICE_NAME
13-
fi
13+
elif is_ubuntu; then
1414
diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
15-
index 2e63fe3c..493a7d04 100644
15+
index cc41a8cd..c64861d3 100644
1616
--- a/lib/neutron_plugins/ovs_base
1717
+++ b/lib/neutron_plugins/ovs_base
18-
@@ -55,7 +55,7 @@ function _neutron_ovs_base_install_ubuntu_dkms {
18+
@@ -61,7 +61,7 @@ function _neutron_ovs_base_install_ubuntu_dkms {
1919
kernel_major_minor=`echo $kernel_version | cut -d. -f1-2`
2020
# From kernel 3.13 on, openvswitch-datapath-dkms is not needed
2121
if vercmp "$kernel_major_minor" "<" "3.13" ; then
2222
- install_package "dkms openvswitch-datapath-dkms linux-headers-$kernel_version"
2323
+ true
2424
fi
2525
}
26-
26+
2727
diff --git a/lib/nova b/lib/nova
28-
index 930529a4..ebc50970 100644
28+
index 6de1d338..3f104364 100644
2929
--- a/lib/nova
30-
31-
...skipping 1 line
32-
@@ -318,7 +318,7 @@ EOF
33-
fi
34-
35-
# ensure that iscsid is started, even when disabled by default
30+
+++ b/lib/nova
31+
@@ -311,9 +311,6 @@ EOF
32+
# set chap algorithms. The default chap_algorithm is md5 which will
33+
# not work under FIPS.
34+
iniset -sudo /etc/iscsi/iscsid.conf DEFAULT "node.session.auth.chap_algs" "SHA3-256,SHA256"
35+
-
36+
- # ensure that iscsid is started, even when disabled by default
3637
- restart_service iscsid
37-
+ # restart_service iscsid
3838
fi
39-
39+
4040
# Rebuild the config file from scratch

‎README.md‎

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,33 @@ devstack and automatically launch the major OpenStack components.
1010
This will take about 30 minutes.
1111

1212
```bash
13-
$ sudo docker-compose up -d
14-
15-
$ sudo docker-compose logs -f
16-
controller | This is your host IP address: 172.28.0.2
17-
controller | Horizon is now available at http://172.28.0.2/dashboard
18-
controller | Keystone is serving at http://172.28.0.2/identity/
19-
controller | The default users are: admin and demo
20-
controller | The password: nomoresecret
21-
controller |
22-
controller | Services are running under systemd unit files.
23-
controller | For more information see:
24-
controller | https://docs.openstack.org/devstack/latest/systemd.html
25-
controller |
26-
controller | DevStack Version: wallaby
27-
controller | Change:
28-
controller | OS Version: Ubuntu 20.04 focal
13+
sudo docker-compose up -d
14+
sudo docker-compose logs -f
15+
# controller | This is your host IP address: 172.28.0.2
16+
# controller | Horizon is now available at http://172.28.0.2/dashboard
17+
# controller | Keystone is serving at http://172.28.0.2/identity/
18+
# controller | The default users are: admin and demo
19+
# controller | The password: nomoresecret
20+
# controller |
21+
# controller | Services are running under systemd unit files.
22+
# controller | For more information see:
23+
# controller | https://docs.openstack.org/devstack/latest/systemd.html
24+
# controller |
25+
# controller | DevStack Version: 2023.1
26+
# controller | Change:
27+
# controller | OS Version: Ubuntu 20.04 focal
2928
```
3029

3130
You can use the OpenStack CLI in the container.
3231

3332
```bash
34-
$ sudo docker-compose exec \
35-
--user stack \
36-
controller \
37-
/bin/bash -c 'source devstack/openrc admin admin; exec /bin/bash'
38-
39-
stack@538b06c0fc0b:~$ openstack endpoint list
40-
+----------------------------------+-----------+--------------+----------------+---------+-----------+---------------------------------------------+
41-
| ID | Region | Service Name | Service Type | Enabled | Interface | URL |
42-
+----------------------------------+-----------+--------------+----------------+---------+-----------+---------------------------------------------+
43-
| 3f865729db974cae886b8e29cbbb91ed | RegionOne | nova_legacy | compute_legacy | True | public | http://172.28.0.2/compute/v2/$(project_id)s |
44-
| 5b4723017af2441dbd7bbccc7f196d49 | RegionOne | keystone | identity | True | admin | http://172.28.0.2/identity |
45-
| 5cfe0eae065c47bbb649937036021f6b | RegionOne | keystone | identity | True | public | http://172.28.0.2/identity |
46-
| 67c0675c2898463b8d0284206bf58ba9 | RegionOne | glance | image | True | public | http://172.28.0.2/image |
47-
| b8181b82dc124c089e8cd38fc23e58e8 | RegionOne | placement | placement | True | public | http://172.28.0.2/placement |
48-
| e17fe28cb31d478c81a3d9b597850ad5 | RegionOne | nova | compute | True | public | http://172.28.0.2/compute/v2.1 |
49-
+----------------------------------+-----------+--------------+----------------+---------+-----------+---------------------------------------------+
33+
sudo docker-compose exec --user stack controller /bin/bash -c \
34+
'source devstack/openrc admin admin; exec openstack image list'
35+
# +--------------------------------------+--------------------------+--------+
36+
# | ID | Name | Status |
37+
# +--------------------------------------+--------------------------+--------+
38+
# | 77b07900-9dab-4ba9-b169-883868e8ecf9 | cirros-0.5.2-x86_64-disk | active |
39+
# +--------------------------------------+--------------------------+--------+
5040
```
5141

5242
# Reference

‎compute/Dockerfile‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@ FROM ubuntu:20.04
22

33
EXPOSE 80 5000 8773 8774 8775 8776 9292
44
ENV DEBIAN_FRONTEND=noninteractive
5-
ENV DEVSTACK_COMMIT=83821a11ac1d6738b63cb10878b8aaa02e153374
5+
ENV DEVSTACK_COMMIT=a4680766515ed9317b71cfb39cd0d75dc04f3d9c
66

77
RUN apt-get update \
88
&& apt-get install -y --no-install-recommends \
9-
ca-certificates=20210119~20.04.1 \
9+
ca-certificates=20211016~20.04.1 \
1010
patch=2.7.6-6 \
11-
systemd=245.4-4ubuntu3.5 \
11+
systemd=245.4-4ubuntu3.18 \
1212
sudo=1.8.31-1ubuntu1.2 \
1313
iproute2=5.5.0-1ubuntu1 \
1414
lsb=11.1.0ubuntu2 \
15-
git=1:2.25.1-1ubuntu3.1 \
16-
curl=7.68.0-1ubuntu2.5 \
15+
git=1:2.25.1-1ubuntu3.6 \
16+
curl=7.68.0-1ubuntu2.14 \
1717
init=1.57 \
1818
&& apt-get -y clean \
19-
&& rm -rf /var/lib/apt/lists/*
20-
RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /bin/wait-for-it.sh \
21-
&& chmod a+x /bin/wait-for-it.sh
22-
23-
RUN useradd -s /bin/bash -d /opt/stack -m stack \
19+
&& rm -rf /var/lib/apt/lists/* \
20+
&& curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /bin/wait-for-it.sh \
21+
&& chmod a+x /bin/wait-for-it.sh \
22+
&& useradd -s /bin/bash -d /opt/stack -m stack \
2423
&& mkdir -p /etc/sudoers.d/ \
2524
&& echo "stack ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/stack
2625

@@ -33,8 +32,8 @@ COPY compute/local.conf /opt/stack/devstack/
3332
COPY compute/devstack.service /etc/systemd/system/
3433
COPY 0001-devstack-disable-ovs.patch /opt/stack/
3534

36-
RUN patch -d ./devstack -p1 < 0001-devstack-disable-ovs.patch
37-
RUN systemctl enable devstack
35+
RUN patch -d ./devstack -p1 < 0001-devstack-disable-ovs.patch \
36+
&& systemctl enable devstack
3837

3938
STOPSIGNAL SIGRTMIN+3
4039
CMD [ "/sbin/init" ]

‎compute/local.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ MYSQL_HOST=$SERVICE_HOST
1616
RABBIT_HOST=$SERVICE_HOST
1717
GLANCE_HOSTPORT=$SERVICE_HOST:9292
1818

19+
GIT_BASE=https://github.com
20+
1921
[[post-config|$NOVA_CONF]]

‎controller/Dockerfile‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@ FROM ubuntu:20.04
22

33
EXPOSE 80 5000 8773 8774 8775 8776 9292
44
ENV DEBIAN_FRONTEND=noninteractive
5-
ENV DEVSTACK_COMMIT=83821a11ac1d6738b63cb10878b8aaa02e153374
5+
ENV DEVSTACK_COMMIT=a4680766515ed9317b71cfb39cd0d75dc04f3d9c
66

77
RUN apt-get update \
88
&& apt-get install -y --no-install-recommends \
9-
ca-certificates=20210119~20.04.1 \
9+
ca-certificates=20211016~20.04.1 \
1010
patch=2.7.6-6 \
11-
systemd=245.4-4ubuntu3.5 \
11+
systemd=245.4-4ubuntu3.18 \
1212
sudo=1.8.31-1ubuntu1.2 \
1313
iproute2=5.5.0-1ubuntu1 \
1414
lsb=11.1.0ubuntu2 \
15-
git=1:2.25.1-1ubuntu3.1 \
16-
curl=7.68.0-1ubuntu2.5 \
15+
git=1:2.25.1-1ubuntu3.6 \
16+
curl=7.68.0-1ubuntu2.14 \
1717
init=1.57 \
1818
&& apt-get -y clean \
19-
&& rm -rf /var/lib/apt/lists/*
20-
RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /bin/wait-for-it.sh \
21-
&& chmod a+x /bin/wait-for-it.sh
22-
23-
RUN useradd -s /bin/bash -d /opt/stack -m stack \
19+
&& rm -rf /var/lib/apt/lists/* \
20+
&& curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /bin/wait-for-it.sh \
21+
&& chmod a+x /bin/wait-for-it.sh \
22+
&& useradd -s /bin/bash -d /opt/stack -m stack \
2423
&& mkdir -p /etc/sudoers.d/ \
2524
&& echo "stack ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/stack
2625

@@ -33,8 +32,8 @@ COPY controller/local.conf /opt/stack/devstack/
3332
COPY controller/devstack.service /etc/systemd/system/
3433
COPY 0001-devstack-disable-ovs.patch /opt/stack/
3534

36-
RUN patch -d ./devstack -p1 < 0001-devstack-disable-ovs.patch
37-
RUN systemctl enable devstack
35+
RUN patch -d ./devstack -p1 < 0001-devstack-disable-ovs.patch \
36+
&& systemctl enable devstack
3837

3938
STOPSIGNAL SIGRTMIN+3
4039
CMD [ "/sbin/init" ]

‎controller/local.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ ENABLED_SERVICES+=,n-api,n-crt,n-obj,n-cond,n-sch,placement-api,placement-client
1414
ENABLED_SERVICES+=,g-api,g-reg
1515
ENABLED_SERVICES+=,horizon
1616

17+
GIT_BASE=https://github.com
18+
1719
[[post-config|$NOVA_CONF]]

0 commit comments

Comments
 (0)