Merge "Allow nova plugins install, add blazar plugin"

This commit is contained in:
Jenkins 2017-06-27 09:39:19 +00:00 committed by Gerrit Code Review
commit e6a6024e98
3 changed files with 17 additions and 1 deletions

View File

@ -57,17 +57,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
ADD nova-base-archive /nova-base-source
ADD plugins-archive /
{% set nova_base_pip_packages = [
'/nova'
] %}
{% set nova_base_plugins_pip_packages = [
'/plugins/*'
] %}
RUN ln -s nova-base-source/* nova \
&& {{ macros.install_pip(nova_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/nova/ \
&& cp -r /nova/etc/nova/* /etc/nova/ \
&& chown -R nova: /etc/nova/ \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/nova/rootwrap.conf
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/nova/rootwrap.conf \
&& if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(nova_base_plugins_pip_packages) }}; \
fi
COPY nova_sudoers /etc/sudoers.d/kolla_nova_sudoers
RUN chmod 750 /etc/sudoers.d \

View File

@ -544,6 +544,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/nova/'
'nova-master.tar.gz')},
'nova-base-plugin-blazar': {
'type': 'url',
'location': ('$tarballs_base/blazar-nova/'
'blazar-nova-master.tar.gz')},
'octavia-base': {
'type': 'url',
'location': ('$tarballs_base/octavia/'

View File

@ -0,0 +1,4 @@
---
features:
- Support install nova plugins in nova source images.
- Install blazar-nova plugin in nova-base source image.