diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-30 10:09:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-30 10:09:27 +0000 |
| commit | da915b2b3cdec94a2ec1a76543ef113798aa720a (patch) | |
| tree | f756c9a0a397056357808840c686171fd763c638 | |
| parent | 2a5800325369e7d18e88a02f5136683efba9b633 (diff) | |
| parent | 2d34a63778d87db0b2910ecb3517d026006a3736 (diff) | |
| download | kolla-da915b2b3cdec94a2ec1a76543ef113798aa720a.tar.gz kolla-da915b2b3cdec94a2ec1a76543ef113798aa720a.zip | |
Merge "Implement nova-mksproxy"
| -rw-r--r-- | docker/nova/nova-mksproxy/Dockerfile.j2 | 14 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
3 files changed, 22 insertions, 0 deletions
diff --git a/docker/nova/nova-mksproxy/Dockerfile.j2 b/docker/nova/nova-mksproxy/Dockerfile.j2 new file mode 100644 index 000000000..f03359340 --- /dev/null +++ b/docker/nova/nova-mksproxy/Dockerfile.j2 @@ -0,0 +1,14 @@ +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block nova_mksproxy_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/false +{% endif %} + +{% block nova_mksproxy_footer %}{% endblock %} +{% block footer %}{% endblock %} +USER nova diff --git a/kolla/common/config.py b/kolla/common/config.py index cffbbc9cf..a625ff944 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -581,6 +581,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/blazar-nova/' 'blazar-nova-master.tar.gz')}, + 'nova-base-plugin-mksproxy': { + 'type': 'url', + 'location': ('$tarballs_base/nova-mksproxy/' + 'nova-mksproxy-master.tar.gz')}, 'novajoin-base': { 'type': 'url', 'location': ('$tarballs_base/novajoin/' diff --git a/kolla/image/build.py b/kolla/image/build.py index 0de6b8bef..a6538ff95 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -106,6 +106,7 @@ SKIPPED_IMAGES = { "kuryr-base", "monasca-base", "neutron-bgp-dragent", + "nova-mksproxy", "ovsdpdk", "searchlight-base", "senlin-base", @@ -131,6 +132,7 @@ SKIPPED_IMAGES = { "kuryr-base", "mistral-event-engine", "monasca-base", + "nova-mksproxy", "novajoin-base", "octavia-base", "searchlight-base", @@ -160,6 +162,7 @@ SKIPPED_IMAGES = { "kuryr-base", "mistral-event-engine", "monasca-base", + "nova-mksproxy", "novajoin-base", "octavia-base", "searchlight-base", @@ -187,6 +190,7 @@ SKIPPED_IMAGES = { "karbor-base", "kuryr-base", "monasca-base", + "nova-mksproxy", "neutron-bgp-dragent", "ovsdpdk", "searchlight-base", |