Skip to content

Bump DevStack to latest master and follow ML2 option rename #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobuhiro11 merged 3 commits into from
Aug 28, 2026
Merged

Bump DevStack to latest master and follow ML2 option rename #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4355626
Bump DevStack to latest master and follow ML2 option rename
bobuhiro11 Aug 28, 2026
a89c85a
Ignore hadolint DL3064 for the DevStack demo credentials
bobuhiro11 Aug 28, 2026
5c941f7
Pin the lint image to hadolint v2.15.1
bobuhiro11 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: hadolint for controller
run: docker run -e "HADOLINT_IGNORE=DL3008" --rm -i hadolint/hadolint < controller/Dockerfile
run: docker run -e "HADOLINT_IGNORE=DL3008,DL3064" --rm -i hadolint/hadolint:v2.15.1 < controller/Dockerfile
- name: hadolint for compute
run: docker run -e "HADOLINT_IGNORE=DL3008" --rm -i hadolint/hadolint < compute/Dockerfile
run: docker run -e "HADOLINT_IGNORE=DL3008,DL3064" --rm -i hadolint/hadolint:v2.15.1 < compute/Dockerfile
test:
runs-on: ubuntu-24.04
steps:
Expand Down
2 changes: 1 addition & 1 deletion compute/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:24.04

EXPOSE 80 5000 8773 8774 8775 8776 9292
ENV DEBIAN_FRONTEND=noninteractive
ENV DEVSTACK_COMMIT=a05d26ebc4ca81ccf1810c9c203143db552c28cb
ENV DEVSTACK_COMMIT=9b0a00865c2537338f72ed5b9b44a0d6bff16eb4

ENV OS_REGION_NAME=RegionOne
ENV OS_PROJECT_DOMAIN_ID=default
Expand Down
2 changes: 1 addition & 1 deletion controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:24.04

EXPOSE 80 5000 8773 8774 8775 8776 9292
ENV DEBIAN_FRONTEND=noninteractive
ENV DEVSTACK_COMMIT=a05d26ebc4ca81ccf1810c9c203143db552c28cb
ENV DEVSTACK_COMMIT=9b0a00865c2537338f72ed5b9b44a0d6bff16eb4

ENV OS_REGION_NAME=RegionOne
ENV OS_PROJECT_DOMAIN_ID=default
Expand Down
6 changes: 5 additions & 1 deletion controller/local.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ disable_service file_tracker
# Use openvswitch as the ml2 plugin driver
Q_AGENT=openvswitch

# Allocate project networks as VXLAN. DevStack defaults this to geneve,
# which the openvswitch agent does not tunnel, so it must be set here.
Q_ML2_TENANT_NETWORK_TYPE=vxlan

# Enable Neutron services neutron-server, neutron-openvswitch-agent,
# neutron-dhcp-agent, neutron-l3-agent and neutron-metadata-agent
enable_service q-svc
Expand All @@ -77,7 +81,7 @@ verbose = True
[[post-config|/$Q_PLUGIN_CONF_FILE]]
[ml2]
type_drivers=flat,gre,vlan,vxlan
tenant_network_types=vxlan
project_network_types=vxlan
mechanism_drivers=openvswitch,l2population

[agent]
Expand Down
Loading