Merge "Fix errors in novnc-proxy" into dev/experimental

ansible/openstack_juno/roles/nova-compute/templates/nova.conf

@@ -9,7 +9,8 @@ iscsi_helper=tgtadm
 libvirt_use_virtio_for_bridges=True
 connection_type=libvirt
 root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-verbose=True
+verbose={{ VERBOSE}}
+debug={{ DEBUG }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
 volumes_path=/var/lib/nova/volumes
@@ -18,32 +19,38 @@ enabled_apis=ec2,osapi_compute,metadata
 vif_plugging_is_fatal: false
 vif_plugging_timeout: 0
 
-rpc_backend = rabbit
-rabbit_host = {{ rabbit_host }}
-rabbit_password = {{RABBIT_PASS}}
-
-my_ip = {{ internal_ip }}
-vncserver_listen = {{ internal_ip }}
-vncserver_proxyclient_address = {{ compute_controller_host }}
-
 auth_strategy = keystone
 
+rpc_backend = rabbit
+rabbit_host = {{ rabbit_host }}
+rabbit_password = {{ RABBIT_PASS }}
+
+my_ip = {{ internal_ip }}
+vnc_enabled = True
+vncserver_listen = 0.0.0.0
+vncserver_proxyclient_address = {{ internal_ip }}
+novncproxy_base_url = http://{{ compute_controller_host }}:6080/vnc_auto.html
+
+novncproxy_host = {{ internal_ip }}
+novncproxy_port = 6080
+
 network_api_class = nova.network.neutronv2.api.API
-neutron_url = http://{{ network_server_host }}:9696
-neutron_auth_strategy = keystone
-neutron_admin_tenant_name = service
-neutron_admin_username = neutron
-neutron_admin_password = {{ NEUTRON_PASS }}
-neutron_admin_auth_url = http://{{ identity_host }}:35357/v2.0
 linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
 firewall_driver = nova.virt.firewall.NoopFirewallDriver
 security_group_api = neutron
 
+instance_usage_audit = True
+instance_usage_audit_period = hour
+notify_on_state_change = vm_and_task_state
+notification_driver = nova.openstack.common.notifier.rpc_notifier
+notification_driver = ceilometer.compute.nova_notifier
+
 [database]
-connection = mysql://nova:{{ NOVA_DBPASS }}@{{ DB_HOST }}/nova
+# The SQLAlchemy connection string used to connect to the database
+connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova
 
 [keystone_authtoken]
-auth_uri = http://{{ identity_host }}:5000/v2.0
+auth_uri = http://{{ identity_host }}:5000/2.0
 identity_uri = http://{{ identity_host }}:35357
 admin_tenant_name = service
 admin_user = nova
@@ -51,3 +58,11 @@ admin_password = {{ NOVA_PASS }}
 
 [glance]
 host = {{ image_host }}
+
+[neutron]
+url = http://{{ network_server_host }}:9696
+auth_strategy = keystone
+admin_tenant_name = service
+admin_username = neutron
+admin_password = {{ NEUTRON_PASS }}
+admin_auth_url = http://{{ identity_host }}:35357/v2.0