diff options
| author | Harm Weites <harm@weites.com> | 2015-05-05 00:37:23 +0200 |
|---|---|---|
| committer | Harm Weites <harm@weites.com> | 2015-05-06 22:32:38 +0200 |
| commit | 5ffc66cd69e1cda087056da25ab25548dacb1d32 (patch) | |
| tree | 180456a11c01670e6794078938ed38bd37af8fa2 /docker/nova-base | |
| parent | d19adb6a6b861147de3235c6867953d872e3aeec (diff) | |
| download | kolla-5ffc66cd69e1cda087056da25ab25548dacb1d32.tar.gz kolla-5ffc66cd69e1cda087056da25ab25548dacb1d32.zip | |
Add a novnc container running the novnc-proxy.
All VNC-specific configuration bits are moved from nova-api-base to
nova-compute and the new nova-novncproxy and nova-consoleauth
containers. The compose specification has been updated to reflect this.
A future patch will make the desired backend configurable (spice/vnc).
Change-Id: I8b64abf125fd1ecd7d3463515e3717dd9bd60420
Blueprint: novnc-container
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index f8f7788e3..8a0bb751a 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -45,8 +45,6 @@ crudini --set $cfg DEFAULT service_down_time 60 crudini --set $cfg DEFAULT rootwrap_config /etc/nova/rootwrap.conf crudini --set $cfg DEFAULT auth_strategy keystone crudini --set $cfg DEFAULT use_forwarded_for False -crudini --set $cfg DEFAULT novncproxy_host 0.0.0.0 -crudini --set $cfg DEFAULT novncproxy_port 6080 crudini --set $cfg DEFAULT glance_api_servers ${GLANCE_API_SERVICE_HOST}:9292 crudini --set $cfg DEFAULT cpu_allocation_ratio 16.0 crudini --set $cfg DEFAULT ram_allocation_ratio 1.5 @@ -54,10 +52,6 @@ crudini --set $cfg DEFAULT scheduler_default_filters RetryFilter,AvailabilityZon crudini --set $cfg DEFAULT compute_driver nova.virt.libvirt.LibvirtDriver crudini --set $cfg DEFAULT vif_plugging_is_fatal True crudini --set $cfg DEFAULT vif_plugging_timeout 300 -crudini --set $cfg DEFAULT novncproxy_base_url http://${PUBLIC_IP}:6080/vnc_auto.html -crudini --set $cfg DEFAULT vncserver_listen 0.0.0.0 -crudini --set $cfg DEFAULT vncserver_proxyclient_address ${PUBLIC_IP} -crudini --set $cfg DEFAULT vnc_enabled True crudini --set $cfg DEFAULT volume_api_class nova.volume.cinder.API crudini --set $cfg DEFAULT image_service nova.image.glance.GlanceImageService crudini --set $cfg DEFAULT osapi_volume_listen 0.0.0.0 |