Minimize nova conf variables

2 files changed, 17 insertions, 17 deletions

diff --git a/openstack/usr/share/openstack/nova.yml b/openstack/usr/share/openstack/nova.yml
index 15b1f3be..9d08a46d 100644
--- a/openstack/usr/share/openstack/nova.yml
+++ b/openstack/usr/share/openstack/nova.yml
@@ -37,16 +37,16 @@
         name=nova
         type=compute
         description="Openstack Compute Service"
-        publicurl={{ NOVA_PUBLIC_URL  }}
-        internalurl={{ NOVA_INTERNAL_URL | default('http://127.0.0.1:8774/v2/%(tenant_id)s') }}
-        adminurl={{ NOVA_ADMIN_URL }}
+        publicurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
+        internalurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
+        adminurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
         region='RegionOne'
         token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
 
-  - postgresql_user: name={{ NOVA_DB_USER }}
+  - postgresql_user: name={{ NOVA_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} password={{ NOVA_DB_PASSWORD }}
     sudo: yes
     sudo_user: nova
-  - postgresql_db: name=nova owner={{ NOVA_DB_USER }}
+  - postgresql_db: name=nova owner={{ NOVA_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }}
     sudo: yes
     sudo_user: nova
 
diff --git a/openstack/usr/share/openstack/nova/nova.conf b/openstack/usr/share/openstack/nova/nova.conf
index 45615927..0d852489 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.
 
@@ -314,10 +314,10 @@ neutron_metadata_proxy_shared_secret= {{ METADATA_PROXY_SHARED_SECRET }}
 # 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=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_listen={{ NOVA_HOST }}
+vncserver_proxyclient_address={{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
+vncserver_listen=0.0.0.0
 vnc_keymap="en-us"
 
 ######################################
@@ -365,7 +365,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 #
@@ -602,8 +602,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