Support using internal network for clients

Openstack mostly defaults to using public endpoints for
internal communication between services. This patch adds
a new option use-internal-endpoints which, if set to True,
will configure services to use internal endpoints where
possible.

Closes-Bug: 1456876
Change-Id: I0f13fa1ab66864859d3adb37e5ec64bd95d7025d

templates/juno/nova.conf

@@ -163,7 +163,7 @@ admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
 {% endif -%}
 
-{% include "parts/cinder" %}
+{% include "parts/section-cinder" %}
 
 [osapi_v3]
 enabled=True

templates/kilo/nova.conf

@@ -148,7 +148,7 @@ admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
 
 {% include "section-keystone-authtoken-legacy" %}
 
-{% include "parts/cinder" %}
+{% include "parts/section-cinder" %}
 
 [osapi_v3]
 enabled=True

templates/liberty/nova.conf

@@ -146,7 +146,7 @@ auth_plugin = password
 
 {% include "section-keystone-authtoken" %}
 
-{% include "parts/cinder" %}
+{% include "parts/section-cinder" %}
 
 [osapi_v3]
 enabled=True

templates/parts/cinder

@@ -1,5 +0,0 @@
-{% if volume_service and volume_service == 'cinder' -%}
-[cinder]
-os_region_name = {{ region }}
-{% endif -%}
-

templates/parts/section-cinder

@@ -0,0 +1,9 @@
+{% if volume_service and volume_service == 'cinder' -%}
+[cinder]
+{% if use_internal_endpoints -%}
+catalog_info = volumev2:cinderv2:internalURL
+{% endif %}
+{% if region -%}
+os_region_name = {{ region }}
+{% endif %}
+{% endif -%}