diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-27 09:39:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-27 09:39:19 +0000 |
| commit | e6a6024e98a570daeee27be0d641f84abb38ab0c (patch) | |
| tree | 069866b1f81626ec8a12fe1ccb7d9fe586c7bec2 | |
| parent | 08cfb7d9fad82bc62e2b6d6651e6d065a08f2dc5 (diff) | |
| parent | 1b924fc4b2430651d6a5f83c462a65622d28c741 (diff) | |
| download | kolla-e6a6024e98a570daeee27be0d641f84abb38ab0c.tar.gz kolla-e6a6024e98a570daeee27be0d641f84abb38ab0c.zip | |
Merge "Allow nova plugins install, add blazar plugin"
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 10 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/nova-plugins-f3ceab61b19d008a.yaml | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 80a228282..959319a59 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -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 \ diff --git a/kolla/common/config.py b/kolla/common/config.py index 0e746c1a9..4db20bda1 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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/' diff --git a/releasenotes/notes/nova-plugins-f3ceab61b19d008a.yaml b/releasenotes/notes/nova-plugins-f3ceab61b19d008a.yaml new file mode 100644 index 000000000..5a3413b4c --- /dev/null +++ b/releasenotes/notes/nova-plugins-f3ceab61b19d008a.yaml @@ -0,0 +1,4 @@ +--- +features: + - Support install nova plugins in nova source images. + - Install blazar-nova plugin in nova-base source image. |