diff options
Diffstat (limited to 'openstack/usr/share/openstack/nova/nova.conf')
| -rw-r--r-- | openstack/usr/share/openstack/nova/nova.conf | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/openstack/usr/share/openstack/nova/nova.conf b/openstack/usr/share/openstack/nova/nova.conf index 8c05e09a..610da0f9 100644 --- a/openstack/usr/share/openstack/nova/nova.conf +++ b/openstack/usr/share/openstack/nova/nova.conf @@ -54,7 +54,7 @@ logdir=/var/log/nova # Mandatory general options # ############################# # ip address of this host (string value) -my_ip={{ NOVA_HOST }} +my_ip={{ MANAGEMENT_INTERFACE_IP_ADDRESS }} #use_ipv6=false @@ -196,9 +196,9 @@ rpc_backend = nova.openstack.common.rpc.impl_kombu ########## # GLANCE # ########## -host={{ GLANCE_HOST }} -port=9292 -protocol=http +glance_host={{ CONTROLLER_HOST_ADDRESS }} +glance_port=9292 +glance_protocol=http # A list of the glance api servers available to nova. Prefix # with https:// for ssl-based glance api servers. @@ -281,13 +281,13 @@ flat_interface=eth0 # Neutron # ########### # This is the URL of your neutron server: -neutron_url={{ NEUTRON_PUBLIC_URL }} +neutron_url = http://{{ CONTROLLER_HOST_ADDRESS }}:9696 neutron_auth_strategy=keystone neutron_admin_tenant_name=service neutron_admin_username={{ NEUTRON_SERVICE_USER }} neutron_admin_password={{ NEUTRON_SERVICE_PASSWORD }} # This is the URL of your Keystone server -neutron_admin_auth_url={{ KEYSTONE_ADMIN_URL }} +neutron_admin_auth_url=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0 # What's below is only needed for nova-compute. @@ -319,9 +319,9 @@ neutron_metadata_proxy_shared_secret= {{ METADATA_PROXY_SHARED_SECRET }} # horizon machine can resolve this alias as the compute node ip. # vnc_enabled=True -novncproxy_base_url={{ NOVA_NOVNCPROXY_BASE_URL }} +novncproxy_base_url=http://{{ CONTROLLER_HOST_ADDRESS }}:6080/vnc_auto.html # Change vncserver_proxyclient_address and vncserver_listen to match each compute host -vncserver_proxyclient_address={{ NOVA_HOST }} +vncserver_proxyclient_address={{ MANAGEMENT_INTERFACE_IP_ADDRESS }} vncserver_listen=0.0.0.0 vnc_keymap="en-us" @@ -370,7 +370,7 @@ vnc_keymap="en-us" # DATABASE # ############ [database] -connection=postgresql://{{ NOVA_DB_USER }}:{{ NOVA_DB_PASSWORD }}@{{ CONTROLLER_HOST }}/nova +connection=postgresql://{{ NOVA_DB_USER }}:{{ NOVA_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/nova ############# # CONDUCTOR # @@ -607,8 +607,8 @@ enabled=false # Keystone authtoken # ###################### [keystone_authtoken] -identity_uri = {{ IDENTITY_URI }} -auth_uri = {{ KEYSTONE_INTERNAL_URL }} +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 auth_port = 35357 auth_protocol = http admin_tenant_name = service |