Browse Source

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

tags/8.7.1
Zuul 1 month ago
parent
commit
63c35cca78
2 changed files with 9 additions and 2 deletions
  1. 6
    2
      playbooks/octavia-files.yaml
  2. 3
    0
      workbooks/octavia_post.yaml

+ 6
- 2
playbooks/octavia-files.yaml View File

@@ -46,7 +46,9 @@
46 46
     OS_PASSWORD: "{{ os_password }}"
47 47
     COMPUTE_API_VERSION: "1.1"
48 48
     OS_CLOUDNAME: "overcloud"
49
-    OS_AUTH_URL: "{{ os_auth_url }}"
49
+    OS_AUTH_URL: "{{ os_int_auth_url }}"
50
+    OS_INTERFACE: "internal"
51
+    OS_ENDPOINT_TYPE: "internal"
50 52
     OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
51 53
     OS_IMAGE_API_VERSION: "2"
52 54
     OS_AUTH_TYPE: "{{ os_auth_type }}"
@@ -77,7 +79,9 @@
77 79
     OS_PASSWORD: "{{ os_password }}"
78 80
     COMPUTE_API_VERSION: "1.1"
79 81
     OS_CLOUDNAME: "overcloud"
80
-    OS_AUTH_URL: "{{ os_auth_url }}"
82
+    OS_AUTH_URL: "{{ os_int_auth_url }}"
83
+    OS_INTERFACE: "internal"
84
+    OS_ENDPOINT_TYPE: "internal"
81 85
     OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
82 86
     OS_IMAGE_API_VERSION: "2"
83 87
     OS_AUTH_TYPE: "{{ os_auth_type }}"

+ 3
- 0
workbooks/octavia_post.yaml View File

@@ -36,6 +36,7 @@ workflows:
36 36
       - overcloud_password
37 37
       - overcloud_project
38 38
       - overcloud_pub_auth_uri
39
+      - overcloud_int_auth_uri
39 40
       - ansible_extra_env_variables:
40 41
           ANSIBLE_HOST_KEY_CHECKING: 'False'
41 42
           ANSIBLE_SSH_RETRIES: '3'
@@ -96,6 +97,7 @@ workflows:
96 97
             os_username: <% $.overcloud_admin %>
97 98
             os_project_name: <% $.overcloud_project %>
98 99
             os_auth_url: <% $.overcloud_pub_auth_uri %>
100
+            os_int_auth_url: <% $.overcloud_int_auth_uri %>
99 101
             os_auth_type: "password"
100 102
             os_identity_api_version: "3"
101 103
             amp_image_name: <% $.amp_image_name %>
@@ -130,6 +132,7 @@ workflows:
130 132
             os_username: <% $.overcloud_admin %>
131 133
             os_project_name: <% $.overcloud_project %>
132 134
             os_auth_url: <% $.overcloud_pub_auth_uri %>
135
+            os_int_auth_url: <% $.overcloud_int_auth_uri %>
133 136
             os_auth_type: "password"
134 137
             os_identity_api_version: "3"
135 138
             amp_image_tag: <% $.amp_image_tag %>

Loading…
Cancel
Save