Merge "Use internal endpoints for configuration in octavia nodes" into stable/queens
This commit is contained in:
commit
63c35cca78
|
@ -46,7 +46,9 @@
|
||||||
OS_PASSWORD: "{{ os_password }}"
|
OS_PASSWORD: "{{ os_password }}"
|
||||||
COMPUTE_API_VERSION: "1.1"
|
COMPUTE_API_VERSION: "1.1"
|
||||||
OS_CLOUDNAME: "overcloud"
|
OS_CLOUDNAME: "overcloud"
|
||||||
OS_AUTH_URL: "{{ os_auth_url }}"
|
OS_AUTH_URL: "{{ os_int_auth_url }}"
|
||||||
|
OS_INTERFACE: "internal"
|
||||||
|
OS_ENDPOINT_TYPE: "internal"
|
||||||
OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
|
OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
|
||||||
OS_IMAGE_API_VERSION: "2"
|
OS_IMAGE_API_VERSION: "2"
|
||||||
OS_AUTH_TYPE: "{{ os_auth_type }}"
|
OS_AUTH_TYPE: "{{ os_auth_type }}"
|
||||||
|
@ -77,7 +79,9 @@
|
||||||
OS_PASSWORD: "{{ os_password }}"
|
OS_PASSWORD: "{{ os_password }}"
|
||||||
COMPUTE_API_VERSION: "1.1"
|
COMPUTE_API_VERSION: "1.1"
|
||||||
OS_CLOUDNAME: "overcloud"
|
OS_CLOUDNAME: "overcloud"
|
||||||
OS_AUTH_URL: "{{ os_auth_url }}"
|
OS_AUTH_URL: "{{ os_int_auth_url }}"
|
||||||
|
OS_INTERFACE: "internal"
|
||||||
|
OS_ENDPOINT_TYPE: "internal"
|
||||||
OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
|
OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
|
||||||
OS_IMAGE_API_VERSION: "2"
|
OS_IMAGE_API_VERSION: "2"
|
||||||
OS_AUTH_TYPE: "{{ os_auth_type }}"
|
OS_AUTH_TYPE: "{{ os_auth_type }}"
|
||||||
|
|
|
@ -36,6 +36,7 @@ workflows:
|
||||||
- overcloud_password
|
- overcloud_password
|
||||||
- overcloud_project
|
- overcloud_project
|
||||||
- overcloud_pub_auth_uri
|
- overcloud_pub_auth_uri
|
||||||
|
- overcloud_int_auth_uri
|
||||||
- ansible_extra_env_variables:
|
- ansible_extra_env_variables:
|
||||||
ANSIBLE_HOST_KEY_CHECKING: 'False'
|
ANSIBLE_HOST_KEY_CHECKING: 'False'
|
||||||
ANSIBLE_SSH_RETRIES: '3'
|
ANSIBLE_SSH_RETRIES: '3'
|
||||||
|
@ -96,6 +97,7 @@ workflows:
|
||||||
os_username: <% $.overcloud_admin %>
|
os_username: <% $.overcloud_admin %>
|
||||||
os_project_name: <% $.overcloud_project %>
|
os_project_name: <% $.overcloud_project %>
|
||||||
os_auth_url: <% $.overcloud_pub_auth_uri %>
|
os_auth_url: <% $.overcloud_pub_auth_uri %>
|
||||||
|
os_int_auth_url: <% $.overcloud_int_auth_uri %>
|
||||||
os_auth_type: "password"
|
os_auth_type: "password"
|
||||||
os_identity_api_version: "3"
|
os_identity_api_version: "3"
|
||||||
amp_image_name: <% $.amp_image_name %>
|
amp_image_name: <% $.amp_image_name %>
|
||||||
|
@ -130,6 +132,7 @@ workflows:
|
||||||
os_username: <% $.overcloud_admin %>
|
os_username: <% $.overcloud_admin %>
|
||||||
os_project_name: <% $.overcloud_project %>
|
os_project_name: <% $.overcloud_project %>
|
||||||
os_auth_url: <% $.overcloud_pub_auth_uri %>
|
os_auth_url: <% $.overcloud_pub_auth_uri %>
|
||||||
|
os_int_auth_url: <% $.overcloud_int_auth_uri %>
|
||||||
os_auth_type: "password"
|
os_auth_type: "password"
|
||||||
os_identity_api_version: "3"
|
os_identity_api_version: "3"
|
||||||
amp_image_tag: <% $.amp_image_tag %>
|
amp_image_tag: <% $.amp_image_tag %>
|
||||||
|
|
Loading…
Reference in New Issue