diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-01 09:47:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-01 09:47:41 +0000 |
| commit | fdb33d04ec2b21c3a28184164666a33351841400 (patch) | |
| tree | a0c9d977a41c110b50e0292ef5ae0bed29fbf0d4 | |
| parent | 0bf7e9b66d0cfe029d5d702dec41d03a60fe1c18 (diff) | |
| parent | e821f58c9b40dfb3f335b51f8a41627ac221726b (diff) | |
| download | kolla-fdb33d04ec2b21c3a28184164666a33351841400.tar.gz kolla-fdb33d04ec2b21c3a28184164666a33351841400.zip | |
Merge "Install neutron-lbaas-dashboard from source in horizon container"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | kolla/image/build.py | 10 |
3 files changed, 18 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 623a5a992..5076804e6 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -94,6 +94,7 @@ RUN echo > /etc/apache2/ports.conf \ {% endif %} ADD horizon-archive /horizon-source +ADD plugins-archive / RUN ln -s horizon-source/* horizon \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /horizon \ && useradd --user-group horizon \ @@ -102,6 +103,11 @@ RUN ln -s horizon-source/* horizon \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ && cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings \ && cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \ + && if [ "$(ls /plugins)" ]; then \ + pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \ + ln -s `find /plugins -name 'neutron-lbaas-dashboard-*' -type d`/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py \ + /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py; \ + fi \ && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear \ && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/horizon && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ diff --git a/kolla/common/config.py b/kolla/common/config.py index 9de8a8198..ba94f1f39 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -209,6 +209,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/horizon/' 'horizon-master.tar.gz')}, + 'horizon-plugin-neutron-lbaas-dashboard': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/' + 'neutron-lbaas-dashboard-master.tar.gz')}, 'ironic-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/ironic/' diff --git a/kolla/image/build.py b/kolla/image/build.py index 1eb3a4634..03534b797 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -824,8 +824,14 @@ class KollaWorker(object): (re.search('{}-plugin-.+'.format(image.name), section) for section in self.conf.list_all_sections()) if match]: - self.conf.register_opts(common_config.get_source_opts(), - plugin) + try: + self.conf.register_opts( + common_config.get_source_opts(), + plugin + ) + except cfg.DuplicateOptError: + LOG.debug('Plugin %s already registered in config', + plugin) image.plugins.append( process_source_installation(image, plugin)) |