1 files changed, 19 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml
index 77ee20e3..f53e38ec 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml
@@ -31,21 +31,21 @@
     - { section: "DEFAULT", option: "auth_strategy", value: "keystone" }
     - { section: "DEFAULT", option: "libvirt_nonblocking", value: "True" }
     - { section: "DEFAULT", option: "libvirt_inject_partition", value: "-1" }
-    - { section: "DEFAULT", option: "rabbit_host", value: "{{ hostvars[groups['config'][0]]['contrail_address'] }}" }
+    - { section: "DEFAULT", option: "rabbit_host", value: "{{ contrail_haproxy_address }}" }
     - { section: "DEFAULT", option: "rabbit_port", value: "5672" }
-    - { section: "DEFAULT", option: "glance_host", value: "{{ hostvars[groups['openstack'][0]]['contrail_address'] }}" }
+    - { section: "DEFAULT", option: "glance_host", value: "{{ contrail_haproxy_address }}" }
     - { section: "DEFAULT", option: "glance_port", value: "9292" }  
     - { section: "DEFAULT", option: "neutron_admin_tenant_name", value: "service" }
     - { section: "DEFAULT", option: "neutron_admin_username", value: "neutron" }
     - { section: "DEFAULT", option: "neutron_admin_password", value: "{{ contrail_admin_password }}" }
-    - { section: "DEFAULT", option: "neutron_admin_auth_url", value: "http://{{ hostvars[groups['openstack'][0]]['contrail_address'] }}:35357/v2.0/" }
-    - { section: "DEFAULT", option: "neutron_url", value: "http://{{ hostvars[groups['config'][0]]['contrail_address'] }}:9696/" }
+    - { section: "DEFAULT", option: "neutron_admin_auth_url", value: "http://{{ contrail_haproxy_address }}:35357/v2.0/" }
+    - { section: "DEFAULT", option: "neutron_url", value: "http://{{ contrail_haproxy_address }}:9696/" }
     - { section: "DEFAULT", option: "neutron_url_timeout", value: "300" }
     - { section: "DEFAULT", option: "network_api_class", value: "nova.network.neutronv2.api.API" }
     - { section: "DEFAULT", option: "compute_driver", value: "libvirt.LibvirtDriver" }
     - { section: "DEFAULT", option: "network_api_class", value: " nova_contrail_vif.contrailvif.ContrailNetworkAPI" }
     - { section: "DEFAULT", option: "ec2_private_dns_show_ip", value: "False" }
-    - { section: "DEFAULT", option: "novncproxy_base_url", value: "http://{{ hostvars[groups['openstack'][0]]['contrail_mgmt_address'] }}:5999/vnc_auto.html" }
+    - { section: "DEFAULT", option: "novncproxy_base_url", value: "http://{{ contrail_haproxy_address }}:5999/vnc_auto.html" }
     - { section: "DEFAULT", option: "vncserver_enabled", value: "True" }
     - { section: "DEFAULT", option: "vncserver_listen", value: "{{ contrail_address }}" }
     - { section: "DEFAULT", option: "vncserver_proxyclient_address", value: "{{ contrail_address }}" }
@@ -54,16 +54,28 @@
     - { section: "DEFAULT", option: "image_cache_manager_interval", value: "0" }
     - { section: "DEFAULT", option: "libvirt_cpu_mode", value: "none" }
     - { section: "DEFAULT", option: "libvirt_vif_driver", value: "nova_contrail_vif.contrailvif.VRouterVIFDriver" }
-    - { section: "database", option: "connection", value: "mysql://nova:nova@{{ hostvars[groups['openstack'][0]]['contrail_address'] }}/nova?charset=utf8" }
+    - { section: "database", option: "connection", value: "mysql://nova:nova@{{ contrail_haproxy_address }}/nova?charset=utf8" }
     - { section: "database", option: "idle_timeout", value: "180" }
     - { section: "database", option: "max_retries", value: "-1" }
     - { section: "keystone_authtoken", option: "admin_tenant_name", value: "service" }
     - { section: "keystone_authtoken", option: "admin_user", value: "nova" }
     - { section: "keystone_authtoken", option: "admin_password", value: "{{ contrail_admin_password }}" }
     - { section: "keystone_authtoken", option: "auth_protocol", value: "http" }
-    - { section: "keystone_authtoken", option: "auth_host", value: "{{ hostvars[groups['openstack'][0]]['contrail_address'] }}" }
+    - { section: "keystone_authtoken", option: "auth_host", value: "{{ contrail_haproxy_address }}" }
     - { section: "keystone_authtoken", option: "signing_dir", value: "/tmp/keystone-signing-nova" }
 
+
+
+#- { section: "DEFAULT", option: "rabbit_host", value: "{{ hostvars[groups['config'][0]]['contrail_address'] }}" }
+#- { section: "DEFAULT", option: "glance_host", value: "{{ hostvars[groups['openstack'][0]]['contrail_address'] }}" }
+#- { section: "DEFAULT", option: "neutron_admin_auth_url", value: "http://{{ hostvars[groups['openstack'][0]]['contrail_address'] }}:35357/v2.0/" }
+#- { section: "DEFAULT", option: "neutron_url", value: "http://{{ hostvars[groups['config'][0]]['contrail_address'] }}:9696/" }
+#- { section: "DEFAULT", option: "novncproxy_base_url", value: "http://{{ hostvars[groups['openstack'][0]]['contrail_mgmt_address'] }}:5999/vnc_auto.html" }
+#- { section: "database", option: "connection", value: "mysql://nova:nova@{{ hostvars[groups['openstack'][0]]['contrail_address'] }}/nova?charset=utf8" }
+#- { section: "keystone_authtoken", option: "auth_host", value: "{{ hostvars[groups['openstack'][0]]['contrail_address'] }}" }
+
+
+
 - name: "change database address if same node as first openstack node"
   ini_file:
     dest: "/etc/nova/nova.conf"