diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-11-18 17:45:58 +0000 |
|---|---|---|
| committer | Richard Ipsum <richardipsum@fastmail.co.uk> | 2014-11-27 18:12:14 +0000 |
| commit | 01e113d5c1474b5e3e43ef05cdcf1b1c13b0dd0c (patch) | |
| tree | 254d11bb38671bc68b3c2603518608d840aa3797 | |
| parent | e0621c0ee96aaed1da40628905287e387a26cb30 (diff) | |
| download | definitions-01e113d5c1474b5e3e43ef05cdcf1b1c13b0dd0c.tar.gz | |
WIP: Configure vncserver and novncproxy for nova controller
| -rw-r--r-- | clusters/openstack-cluster.morph | 1 | ||||
| -rw-r--r-- | openstack-nova.configure | 1 | ||||
| -rw-r--r-- | openstack/etc/nova/nova.conf | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph index d47e49f6..0d8a13b0 100644 --- a/clusters/openstack-cluster.morph +++ b/clusters/openstack-cluster.morph @@ -33,4 +33,5 @@ systems: NOVA_PUBLIC_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\" NOVA_INTERNAL_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\" NOVA_ADMIN_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\" + NOVA_NOVNCPROXY_BASE_URL: http:\/\/localhost:6080\/vnc_auto.html NOVA_REGION: LON diff --git a/openstack-nova.configure b/openstack-nova.configure index 0a4d7505..de18beb0 100644 --- a/openstack-nova.configure +++ b/openstack-nova.configure @@ -33,6 +33,7 @@ s/##NOVA_ADMIN_URL##/$NOVA_ADMIN_URL/g s/##NOVA_HOST##/$NOVA_HOST/g s/##NOVA_REGION##/$NOVA_REGION/g s/##GLANCE_HOST##/$GLANCE_HOST/g +s/##NOVA_NOVNCPROXY_BASE_URL##/$NOVA_NOVNCPROXY_BASE_URL/g EOF sed -f "$ROOT"/etc/openstack-nova-setup.sed -i \ diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf index 70890298..98c687a8 100644 --- a/openstack/etc/nova/nova.conf +++ b/openstack/etc/nova/nova.conf @@ -300,10 +300,10 @@ neutron_admin_password=##NOVA_SERVICE_PASSWORD## # Do not forget to restart Nova daemons and restart your VMs if you want to use # NoVNC form now on (VMs video card needs to be attached to a console type, and # they can accept only one video card at a time). -vnc_enabled=false -#novncproxy_base_url=http://192.168.0.1:6080/vnc_auto.html +vnc_enabled=True +novncproxy_base_url=##NOVA_NOVNCPROXY_BASE_URL## # Change vncserver_proxyclient_address and vncserver_listen to match each compute host -#vncserver_proxyclient_address=127.0.0.1 +vncserver_proxyclient_address=##NOVA_HOST## vncserver_listen=0.0.0.0 vnc_keymap="en-us" |