Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kolla Ansible
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Very Demiurge Very Mindful
Kolla Ansible
Commits
f35bdeeb
Commit
f35bdeeb
authored
9 years ago
by
Jenkins
Committed by
Gerrit Code Review
9 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Install plugins in neutron-server if available"
parents
b121d3cf
acb13dc5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/neutron/neutron-server/Dockerfile.j2
+5
-1
5 additions, 1 deletion
docker/neutron/neutron-server/Dockerfile.j2
etc/kolla/kolla-build.conf
+11
-0
11 additions, 0 deletions
etc/kolla/kolla-build.conf
with
16 additions
and
1 deletion
docker/neutron/neutron-server/Dockerfile.j2
+
5
−
1
View file @
f35bdeeb
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
MAINTAINER {{ maintainer }}
MAINTAINER {{ maintainer }}
ADD plugins-archive /
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \
&& if [[ "$(ls /plugins)" ]]; then \
pip --no-cache-dir install -c requirements/upper-constraints.txt /plugins/*; \
fi
{{ include_footer }}
{{ include_footer }}
This diff is collapsed.
Click to expand it.
etc/kolla/kolla-build.conf
+
11
−
0
View file @
f35bdeeb
...
@@ -126,6 +126,17 @@ location = http://tarballs.openstack.org/murano/murano-master.tar.gz
...
@@ -126,6 +126,17 @@ location = http://tarballs.openstack.org/murano/murano-master.tar.gz
type
=
url
type
=
url
location
=
http
://
tarballs
.
openstack
.
org
/
neutron
/
neutron
-
master
.
tar
.
gz
location
=
http
://
tarballs
.
openstack
.
org
/
neutron
/
neutron
-
master
.
tar
.
gz
# The following two blocks show how plugins can be installed into supported
# images. Note, configuration will need to be provided via Ansible.
#
#[neutron-server-plugin-networking-arista]
#type = url
#location = http://tarballs.openstack.org/networking-arista/networking-arista-master.tar.gz
#[neutron-server-plugin-networking-brocade]
#type = url
#location = http://tarballs.openstack.org/networking-brocade/networking-brocade-master.tar.gz
[
nova
-
base
]
[
nova
-
base
]
type
=
url
type
=
url
location
=
http
://
tarballs
.
openstack
.
org
/
nova
/
nova
-
master
.
tar
.
gz
location
=
http
://
tarballs
.
openstack
.
org
/
nova
/
nova
-
master
.
tar
.
gz
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment