Merge "Validation should use the public endpoint"
This commit is contained in:
commit
d12ceec5bd
|
@ -123,15 +123,15 @@ class S(BaseHTTPRequestHandler):
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
{
|
{
|
||||||
"url": f"{server_url}:{server_port}/cinder",
|
"url": f"{server_url}:{server_port}/cinder",
|
||||||
"interface": "admin",
|
"interface": "public",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"url": f"{server_url}:{server_port}/cinder",
|
"url": f"{server_url}:{server_port}/cinder",
|
||||||
"interface": "admin",
|
"interface": "public",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"url": f"{server_url}:{server_port}/cinder",
|
"url": f"{server_url}:{server_port}/cinder",
|
||||||
"interface": "admin",
|
"interface": "public",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
"name": "cinderv3",
|
"name": "cinderv3",
|
||||||
|
@ -140,15 +140,15 @@ class S(BaseHTTPRequestHandler):
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
{
|
{
|
||||||
"url": f"{server_url}:{server_port}/nova",
|
"url": f"{server_url}:{server_port}/nova",
|
||||||
"interface": "admin",
|
"interface": "public",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"url": f"{server_url}:{server_port}/nova",
|
"url": f"{server_url}:{server_port}/nova",
|
||||||
"interface": "admin",
|
"interface": "public",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"url": f"{server_url}:{server_port}/nova",
|
"url": f"{server_url}:{server_port}/nova",
|
||||||
"interface": "admin",
|
"interface": "public",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
"name": "nova",
|
"name": "nova",
|
||||||
|
|
|
@ -16,14 +16,14 @@
|
||||||
|
|
||||||
- name: Extracting the endpoint url
|
- name: Extracting the endpoint url
|
||||||
set_fact:
|
set_fact:
|
||||||
endpoint: "{{ catalog.endpoints|selectattr('interface', 'eq', 'admin')|first }}"
|
endpoint: "{{ catalog.endpoints|selectattr('interface', 'eq', 'public')|first }}"
|
||||||
loop: "{{ auth_token.json.token.catalog }}"
|
loop: "{{ auth_token.json.token.catalog }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: catalog
|
loop_var: catalog
|
||||||
when: catalog.name == os_service
|
when: catalog.name == os_service
|
||||||
|
|
||||||
- fail:
|
- fail:
|
||||||
msg: "No endpoint found for {{ os_service }} interface admin in catalog"
|
msg: "No endpoint found for {{ os_service }} interface public in catalog"
|
||||||
when: endpoint is not defined
|
when: endpoint is not defined
|
||||||
|
|
||||||
- name: Get services
|
- name: Get services
|
||||||
|
|
Loading…
Reference in New Issue