openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Use internal endpoints for configuration in octavia nodes" into stable/queens

This commit is contained in:
Zuul 2019-08-08 10:53:43 +00:00 committed by Gerrit Code Review
parent e3ca555245 6d75852f82
commit 63c35cca78
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
playbooks/octavia-files.yaml
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 }}"

3
workbooks/octavia_post.yaml
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 %>