diff options
Diffstat (limited to 'deploy/adapters/ansible/openstack_juno')
3 files changed, 14 insertions, 14 deletions
diff --git a/deploy/adapters/ansible/openstack_juno/templates/neutron-network.conf b/deploy/adapters/ansible/openstack_juno/templates/neutron-network.conf index df27cd47..63ac27ee 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/neutron-network.conf +++ b/deploy/adapters/ansible/openstack_juno/templates/neutron-network.conf @@ -304,7 +304,7 @@ notify_nova_on_port_status_changes = True notify_nova_on_port_data_changes = True # URL for connection to nova (Only supports one nova region currently). -nova_url = http://{{ HA_VIP }}:8774/v2 +nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region nova_region_name = regionOne @@ -318,7 +318,7 @@ nova_admin_username = nova nova_admin_password = {{ NOVA_PASS }} # Authorization URL for connection to nova in admin context. -nova_admin_auth_url = http://{{ HA_VIP }}:35357/v2.0 +nova_admin_auth_url = http://{{ internal_vip.ip }}:35357/v2.0 # Number of seconds between sending events to nova if there are any events to send send_events_interval = 2 @@ -392,8 +392,8 @@ report_interval = 30 # =========== end of items for agent management extension ===== [keystone_authtoken] -auth_uri = http://{{ HA_VIP }}:5000/v2.0 -identity_uri = http://{{ HA_VIP }}:35357 +auth_uri = http://{{ internal_vip.ip }}:5000/v2.0 +identity_uri = http://{{ internal_vip.ip }}:35357 admin_tenant_name = service admin_user = neutron admin_password = {{ NEUTRON_PASS }} diff --git a/deploy/adapters/ansible/openstack_juno/templates/neutron.conf b/deploy/adapters/ansible/openstack_juno/templates/neutron.conf index 73128488..8a5e76ee 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack_juno/templates/neutron.conf @@ -304,7 +304,7 @@ notify_nova_on_port_status_changes = True notify_nova_on_port_data_changes = True # URL for connection to nova (Only supports one nova region currently). -nova_url = http://{{ HA_VIP }}:8774/v2 +nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region nova_region_name = regionOne @@ -319,7 +319,7 @@ nova_admin_tenant_id = {{ NOVA_ADMIN_TENANT_ID.stdout_lines[0] }} nova_admin_password = {{ NOVA_PASS }} # Authorization URL for connection to nova in admin context. -nova_admin_auth_url = http://{{ HA_VIP }}:35357/v2.0 +nova_admin_auth_url = http://{{ internal_vip.ip }}:35357/v2.0 # Number of seconds between sending events to nova if there are any events to send send_events_interval = 2 @@ -393,8 +393,8 @@ report_interval = 30 # =========== end of items for agent management extension ===== [keystone_authtoken] -auth_uri = http://{{ HA_VIP }}:5000/v2.0 -identity_uri = http://{{ HA_VIP }}:35357 +auth_uri = http://{{ internal_vip.ip }}:5000/v2.0 +identity_uri = http://{{ internal_vip.ip }}:35357 admin_tenant_name = service admin_user = neutron admin_password = {{ NEUTRON_PASS }} diff --git a/deploy/adapters/ansible/openstack_juno/templates/nova.conf b/deploy/adapters/ansible/openstack_juno/templates/nova.conf index 9b4280c1..559a6d82 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/nova.conf +++ b/deploy/adapters/ansible/openstack_juno/templates/nova.conf @@ -33,7 +33,7 @@ my_ip = {{ internal_ip }} vnc_enabled = True vncserver_listen = {{ internal_ip }} vncserver_proxyclient_address = {{ internal_ip }} -novncproxy_base_url = http://{{ HA_VIP }}:6080/vnc_auto.html +novncproxy_base_url = http://{{ internal_vip.ip }}:6080/vnc_auto.html novncproxy_host = {{ internal_ip }} novncproxy_port = 6080 @@ -54,21 +54,21 @@ notification_driver = ceilometer.compute.nova_notifier connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova [keystone_authtoken] -auth_uri = http://{{ HA_VIP }}:5000/2.0 -identity_uri = http://{{ HA_VIP }}:35357 +auth_uri = http://{{ internal_vip.ip }}:5000/2.0 +identity_uri = http://{{ internal_vip.ip }}:35357 admin_tenant_name = service admin_user = nova admin_password = {{ NOVA_PASS }} [glance] -host = {{ HA_VIP }} +host = {{ internal_vip.ip }} [neutron] -url = http://{{ HA_VIP }}:9696 +url = http://{{ internal_vip.ip }}:9696 auth_strategy = keystone admin_tenant_name = service admin_username = neutron admin_password = {{ NEUTRON_PASS }} -admin_auth_url = http://{{ HA_VIP }}:35357/v2.0 +admin_auth_url = http://{{ internal_vip.ip }}:35357/v2.0 service_metadata_proxy = True metadata_proxy_shared_secret = {{ METADATA_SECRET }} |