Use internal endpoints for configuration in octavia nodes

When running configuration steps for octavia in octavia nodes, use
internal endpoints since public endpoints may not be available due to
network topology (spine-leaf network + octavia in networkers).

Specific to stable/queens: updated workbooks/octavia_post.yaml to
export os_int_auth_url variable.

Depends-On: https://review.opendev.org/#/c/674750/

Closes-Bug: #1835171
Change-Id: I242f7bb718b08724da21cafa86d3e8853d0ff453
(cherry picked from tripleo-ansible commit
6deec581ac00b3901570f9f4e4768a266cea37e1)
(cherry picked from commit fd44741029dc65d934d8c32b5d8fa5cbc70eefe4)
(cherry picked from commit 3d537b21ecae9b413514e5d3c7b878ae5bb5dc81)
This commit is contained in:
Gregory Thiemonge 2019-07-15 14:02:26 +02:00
parent 341b3cbb48
commit 6d75852f82
2 changed files with 9 additions and 2 deletions

View File

@ -46,7 +46,9 @@
OS_PASSWORD: "{{ os_password }}"
COMPUTE_API_VERSION: "1.1"
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_IMAGE_API_VERSION: "2"
OS_AUTH_TYPE: "{{ os_auth_type }}"
@ -77,7 +79,9 @@
OS_PASSWORD: "{{ os_password }}"
COMPUTE_API_VERSION: "1.1"
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_IMAGE_API_VERSION: "2"
OS_AUTH_TYPE: "{{ os_auth_type }}"

View File

@ -36,6 +36,7 @@ workflows:
- overcloud_password
- overcloud_project
- overcloud_pub_auth_uri
- overcloud_int_auth_uri
- ansible_extra_env_variables:
ANSIBLE_HOST_KEY_CHECKING: 'False'
ANSIBLE_SSH_RETRIES: '3'
@ -96,6 +97,7 @@ workflows:
os_username: <% $.overcloud_admin %>
os_project_name: <% $.overcloud_project %>
os_auth_url: <% $.overcloud_pub_auth_uri %>
os_int_auth_url: <% $.overcloud_int_auth_uri %>
os_auth_type: "password"
os_identity_api_version: "3"
amp_image_name: <% $.amp_image_name %>
@ -130,6 +132,7 @@ workflows:
os_username: <% $.overcloud_admin %>
os_project_name: <% $.overcloud_project %>
os_auth_url: <% $.overcloud_pub_auth_uri %>
os_int_auth_url: <% $.overcloud_int_auth_uri %>
os_auth_type: "password"
os_identity_api_version: "3"
amp_image_tag: <% $.amp_image_tag %>