Skip to content

Commit f547045

Browse files
committed
Split neutron-server rock into neutron-api, neutron-rpc-server, and neutron-periodic-workers
The standalone neutron-server daemon was removed upstream. Neutron now runs as separate processes: an API served via Apache/mod_wsgi, an RPC server, and periodic workers. The Ubuntu neutron source package reflects this with distinct binary packages. - Rename neutron-server to neutron-api, migrated to WSGI pattern (apachectl -D FOREGROUND) matching nova-api - Create neutron-rpc-server rock (standalone daemon) - Create neutron-periodic-workers rock (standalone daemon) - Create neutron-consolidated rock
1 parent fc55239 commit f547045

12 files changed

Lines changed: 821 additions & 15 deletions

File tree

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# neutron-server ROCK
1+
# neutron-api ROCK
22

3-
This is a ROCK OCI image for neutron-server.
3+
This is a ROCK OCI image for neutron-api.
44

55
More information is coming.
66

@@ -17,16 +17,16 @@ it will help ensure that all layers of the image are imported
1717
into docker (this is just the top layer).
1818

1919
```bash
20-
> skopeo --insecure-policy copy oci-archive:neutron-server_2025.1_amd64.rock docker-daemon:neutron-server:2025.1
20+
> skopeo --insecure-policy copy oci-archive:neutron-api_2026.1_amd64.rock docker-daemon:neutron-api:2026.1
2121
```
2222

2323
If you are interested in giving it a go in Microk8s, you can
2424
export the image from your docker registry and then into the
2525
microk8s registry:
2626

2727
```bash
28-
> docker save neutron-server:2025.1 > ./neutron-server_2025.1.tar
29-
> microk8s ctr image import ./neutron-server_2025.1.tar
28+
> docker save neutron-api:2026.1 > ./neutron-api_2026.1.tar
29+
> microk8s ctr image import ./neutron-api_2026.1.tar
3030
# Try with sunbeam
31-
> juju attach-resource neutron-server neutron-server-image=neutron-server:2025.1
31+
> juju attach-resource neutron-api neutron-api-image=neutron-api:2026.1
3232
```
Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: neutron-server
2-
summary: Openstack neutron-server
1+
name: neutron-api
2+
summary: Openstack neutron-api
33
license: Apache-2.0
44
description: |
5-
Ubuntu distribution of OpenStack neutron-server
5+
Ubuntu distribution of OpenStack neutron-api
66
version: "2026.1"
77
# renovate: base: ubuntu:26.04@sha256:fed6ddb82c61194e1814e93b59cfcb6759e5aa33c4e41bb3782313c2386ed6df
88
base: ubuntu@26.04
@@ -12,11 +12,9 @@ platforms:
1212
arm64:
1313

1414
services:
15-
neutron-server:
15+
wsgi-neutron-api:
1616
override: replace
17-
command: neutron-server
18-
user: neutron
19-
group: neutron
17+
command: apachectl -D FOREGROUND
2018

2119
parts:
2220
neutron-user:
@@ -34,15 +32,20 @@ parts:
3432
--shell /bin/false \
3533
neutron
3634
37-
neutron-server:
35+
neutron-api:
3836
after: [neutron-user]
3937
plugin: nil
4038
overlay-packages:
4139
- sudo
42-
- neutron-server
40+
- neutron-api
4341
- python3-ironic-neutron-agent
4442
- python3-neutron-dynamic-routing
4543
- python3-neutron-vpnaas
4644
- python3-networking-generic-switch
4745
- python3-networking-sfc
4846
- python3-oslo.vmware
47+
- apache2
48+
- libapache2-mod-wsgi-py3
49+
override-prime: |
50+
craftctl default
51+
echo > $CRAFT_PRIME/etc/apache2/ports.conf

rocks/neutron-consolidated/LICENSE

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
https://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
Copyright 2023 Canonical Ltd.
180+
181+
Licensed under the Apache License, Version 2.0 (the "License");
182+
you may not use this file except in compliance with the License.
183+
You may obtain a copy of the License at
184+
185+
https://www.apache.org/licenses/LICENSE-2.0
186+
187+
Unless required by applicable law or agreed to in writing, software
188+
distributed under the License is distributed on an "AS IS" BASIS,
189+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
190+
See the License for the specific language governing permissions and
191+
limitations under the License.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# neutron-consolidated ROCK
2+
3+
This is a ROCK OCI image for neutron services
4+
5+
More information is coming.
6+
7+
For now, if you want to play with it:
8+
9+
```bash
10+
> sudo snap install rockcraft --edge --classic
11+
> rockcraft pack
12+
```
13+
14+
Now that you have created the ROCK, you can import it into
15+
your local docker repository. Using skopeo is a good idea as
16+
it will help ensure that all layers of the image are imported
17+
into docker (this is just the top layer).
18+
19+
```bash
20+
> skopeo --insecure-policy copy oci-archive:neutron-consolidated_2026.1_amd64.rock docker-daemon:neutron-consolidated:2026.1
21+
```
22+
23+
If you are interested in giving it a go in Microk8s, you can
24+
export the image from your docker registry and then into the
25+
microk8s registry:
26+
27+
```bash
28+
> docker save neutron-consolidated:2026.1 > ./neutron-consolidated_2026.1.tar
29+
> microk8s ctr image import ./neutron-consolidated_2026.1.tar
30+
# Try with sunbeam
31+
> juju attach-resource neutron-k8s neutron-api-image=neutron-consolidated:2026.1
32+
> juju attach-resource neutron-k8s neutron-rpc-server-image=neutron-consolidated:2026.1
33+
> juju attach-resource neutron-k8s neutron-periodic-workers-image=neutron-consolidated:2026.1
34+
```
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: neutron-consolidated
2+
summary: Openstack neutron-consolidated
3+
license: Apache-2.0
4+
description: |
5+
Ubuntu distribution of OpenStack Neutron which can be used for all Neutron services
6+
version: "2026.1"
7+
# renovate: base: ubuntu:26.04@sha256:fed6ddb82c61194e1814e93b59cfcb6759e5aa33c4e41bb3782313c2386ed6df
8+
base: ubuntu@26.04
9+
build-base: devel
10+
platforms:
11+
amd64:
12+
arm64:
13+
14+
parts:
15+
neutron-user:
16+
plugin: nil
17+
# 42435:42435 for kolla compatibility
18+
overlay-script: |
19+
groupadd --root $CRAFT_OVERLAY --gid 42435 --system neutron
20+
useradd \
21+
--gid 42435 \
22+
--uid 42435 \
23+
--no-create-home \
24+
--home /var/lib/neutron \
25+
--root $CRAFT_OVERLAY \
26+
--system \
27+
--shell /bin/false \
28+
neutron
29+
30+
neutron-consolidated:
31+
after: [neutron-user]
32+
plugin: nil
33+
overlay-packages:
34+
- sudo
35+
- neutron-api
36+
- neutron-rpc-server
37+
- neutron-periodic-workers
38+
- python3-ironic-neutron-agent
39+
- python3-neutron-dynamic-routing
40+
- python3-neutron-vpnaas
41+
- python3-networking-generic-switch
42+
- python3-networking-sfc
43+
- python3-oslo.vmware
44+
- apache2
45+
- libapache2-mod-wsgi-py3
46+
override-prime: |
47+
craftctl default
48+
echo > $CRAFT_PRIME/etc/apache2/ports.conf

0 commit comments

Comments
 (0)