Adapt openstack.cloud.catalog_service calls to Ansible OpenStack Col.>=2.0.0

Change-Id: Ia2d96552e302b861a2df65f34137ad6c55973770
changes/23/865523/2
Jakob Meng 2 months ago
parent 243fb1dd97
commit 1c0cbcb866

@ -94,7 +94,7 @@
- name: "Create ironic admin endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ baremetal_catalog_service.id }}"
service: "{{ baremetal_catalog_service.service.id }}"
endpoint_interface: admin
url: "{{ ironic.keystone.admin_url | default(ironic_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
@ -110,7 +110,7 @@
- name: "Create ironic public endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ baremetal_catalog_service.id }}"
service: "{{ baremetal_catalog_service.service.id }}"
endpoint_interface: public
url: "{{ ironic.keystone.public_url | default(ironic_public_url) | default(ironic_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
@ -126,7 +126,7 @@
- name: "Create ironic internal endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ baremetal_catalog_service.id }}"
service: "{{ baremetal_catalog_service.service.id }}"
endpoint_interface: internal
url: "{{ ironic.keystone.internal_url | default(ironic_private_url) | default(ironic_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"

@ -81,7 +81,7 @@
- name: "Create ironic-inspector admin endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ introspection_catalog_service.id }}"
service: "{{ introspection_catalog_service.service.id }}"
endpoint_interface: admin
url: "{{ ironic_inspector.keystone.admin_url | default(ironic_inspector_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
@ -97,7 +97,7 @@
- name: "Create ironic-inspector public endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ introspection_catalog_service.id }}"
service: "{{ introspection_catalog_service.service.id }}"
endpoint_interface: public
url: "{{ ironic_inspector.keystone.public_url | default(ironic_inspector_public_url) | default(ironic_inspector_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
@ -113,7 +113,7 @@
- name: "Create ironic-inspector internal endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ introspection_catalog_service.id }}"
service: "{{ introspection_catalog_service.service.id }}"
endpoint_interface: internal
url: "{{ ironic_inspector.keystone.internal_url | default(ironic_inspector_private_url) | default(ironic_inspector_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"

@ -82,7 +82,7 @@
- name: "Update identity internal endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ identity_catalog_service.id }}"
service: "{{ identity_catalog_service.service.id }}"
endpoint_interface: internal
url: "{{ keystone.bootstrap.internal_url | default(keystone_private_url) | default(keystone_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
@ -90,12 +90,12 @@
ca_cert: "{{ keystone_ca_cert | default(omit) }}"
ignore_errors: true
no_log: true
when: identity_catalog_service.id is defined
when: identity_catalog_service.service.id is defined
- name: "Update identity admin endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ identity_catalog_service.id }}"
service: "{{ identity_catalog_service.service.id }}"
endpoint_interface: admin
url: "{{ keystone.bootstrap.admin_url | default(keystone_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
@ -103,14 +103,14 @@
ca_cert: "{{ keystone_ca_cert | default(omit) }}"
ignore_errors: true
no_log: true
when: identity_catalog_service.id is defined
when: identity_catalog_service.service.id is defined
# NOTE(dtantsur): the public endpoint MUST go last, otherwise the other
# endpoints will fail to update.
- name: "Update identity public endpoint"
openstack.cloud.endpoint:
state: present
service: "{{ identity_catalog_service.id }}"
service: "{{ identity_catalog_service.service.id }}"
endpoint_interface: public
url: "{{ keystone.bootstrap.public_url | default(keystone_public_url) | default(keystone_api_url) }}"
region: "{{ keystone.bootstrap.region_name | default('RegionOne') }}"
@ -118,4 +118,4 @@
ca_cert: "{{ keystone_ca_cert | default(omit) }}"
ignore_errors: true
no_log: true
when: identity_catalog_service.id is defined
when: identity_catalog_service.service.id is defined

Loading…
Cancel
Save