commit f75216132fe337617a38123ea344554cffa6bc54
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Apr 04 15:12:30 2018 +0000
committer Gerrit Code Review <gerrit2@7e698601da6d> Wed Apr 04 15:12:30 2018 +0000
tree ec233bfed97abd31b1a11febe53f6630989d6615
parent 3b21763d73c42b152f8d95a9794264b5980c8754
parent c4d05114c06e29b8cdbd2f9f19de41cfcee152ed

Merge "Fix nova user dependencies"

nova/files/ocata/nova-compute.conf.Debian

diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index 8e8b3de..d7854af 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -9929,9 +9929,13 @@
 {%- if compute.bind is defined and compute.bind.vnc_port is defined %}
 novncproxy_port={{ compute.bind.vnc_port }}
 {%- endif %}
-vncserver_listen=0.0.0.0
-{%- if compute.bind is defined and compute.bind.vnc_address is defined %}
+{%- if compute.bind is defined %}
+{%- if compute.bind.vnc_address is defined %}
+vncserver_listen={{ compute.bind.vnc_address }}
 vncserver_proxyclient_address={{ compute.bind.vnc_address }}
+{%- else %}
+vncserver_listen=0.0.0.0
+{%- endif %}
 {%- endif %}
 keymap = {{ compute.get('vnc_keymap', 'en-us') }}
 

nova/files/pike/nova-compute.conf.Debian

diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 8e8b3de..d7854af 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -9929,9 +9929,13 @@
 {%- if compute.bind is defined and compute.bind.vnc_port is defined %}
 novncproxy_port={{ compute.bind.vnc_port }}
 {%- endif %}
-vncserver_listen=0.0.0.0
-{%- if compute.bind is defined and compute.bind.vnc_address is defined %}
+{%- if compute.bind is defined %}
+{%- if compute.bind.vnc_address is defined %}
+vncserver_listen={{ compute.bind.vnc_address }}
 vncserver_proxyclient_address={{ compute.bind.vnc_address }}
+{%- else %}
+vncserver_listen=0.0.0.0
+{%- endif %}
 {%- endif %}
 keymap = {{ compute.get('vnc_keymap', 'en-us') }}