From bea76dc74094f800b87622afa6c644614ec449ec Mon Sep 17 00:00:00 2001
From: Matt Dorn <madorn@gmail.com>
Date: Tue, 18 Aug 2015 23:45:52 +0000
Subject: [PATCH] Added options to enable SSL for noVNC proxy

Added required options to enable SSL for noVNC proxy service when configuring
the dashboard for HTTPS.

Change-Id: I8b2cafe1186c569d7c9b1f0f152fb8a9daf5d597
Closes-Bug: 1481972
---
 .../section_dashboard-configure-https.xml     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/common/section_dashboard-configure-https.xml b/doc/common/section_dashboard-configure-https.xml
index c6cff39a92..9b15a291ab 100644
--- a/doc/common/section_dashboard-configure-https.xml
+++ b/doc/common/section_dashboard-configure-https.xml
@@ -110,4 +110,23 @@ Allow from all
                 browser redirects you to the HTTPS page.</para>
         </step>
     </procedure>
+  <note>
+        <para>Configuring the dashboard for HTTPS also requires enabling SSL
+            for the noVNC proxy service.
+            On the controller node, add the following additional options to the
+                    <filename>[DEFAULT]</filename>
+                section of the
+                    <filename>/etc/nova/nova.conf</filename>
+                file:
+            <programlisting language="python">[DEFAULT]
+...
+ssl_only = true
+cert = /etc/apache2/SSL/openstack.example.com.crt
+key = /etc/apache2/SSL/openstack.example.com.key</programlisting></para>
+        <para>On the compute nodes, ensure the <code>nonvncproxy_base_url</code>
+            option points to a URL with an HTTPS scheme:</para>
+            <programlisting language="python">[DEFAULT]
+...
+novncproxy_base_url = https://controller:6080/vnc_auto.html</programlisting>
+</note>
 </section>