aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2017-10-17 00:17:52 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2017-10-17 00:19:10 +0800
commit2d34a63778d87db0b2910ecb3517d026006a3736 (patch)
tree3693c7ee7a431b64133070db96c9998e3eba499b
parentd71c25caa4da6aac2137362a1f48eaf62a4286f0 (diff)
downloadkolla-2d34a63778d87db0b2910ecb3517d026006a3736.tar.gz
kolla-2d34a63778d87db0b2910ecb3517d026006a3736.zip
Implement nova-mksproxy
nova-mksproxy is a Nova console proxy for VMware instances Change-Id: I446dd9eacdd0f0ee6f980133d1419d67c8dc7857 Closes-Bug: #1723997
-rw-r--r--docker/nova/nova-mksproxy/Dockerfile.j214
-rwxr-xr-xkolla/common/config.py4
-rwxr-xr-xkolla/image/build.py4
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 e12a7ad08..7776cfef5 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -574,6 +574,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 916883f1c..aba59e909 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -105,6 +105,7 @@ SKIPPED_IMAGES = {
"kuryr-base",
"monasca-base",
"neutron-bgp-dragent",
+ "nova-mksproxy",
"ovsdpdk",
"searchlight-base",
"senlin-base",
@@ -130,6 +131,7 @@ SKIPPED_IMAGES = {
"kuryr-base",
"mistral-event-engine",
"monasca-base",
+ "nova-mksproxy",
"novajoin-base",
"octavia-base",
"searchlight-base",
@@ -158,6 +160,7 @@ SKIPPED_IMAGES = {
"kuryr-base",
"mistral-event-engine",
"monasca-base",
+ "nova-mksproxy",
"novajoin-base",
"octavia-base",
"searchlight-base",
@@ -184,6 +187,7 @@ SKIPPED_IMAGES = {
"karbor-base",
"kuryr-base",
"monasca-base",
+ "nova-mksproxy",
"neutron-bgp-dragent",
"ovsdpdk",
"searchlight-base",