From 1c0cbcb86667a0ca60d6722a24a5b56de39d9fdf Mon Sep 17 00:00:00 2001
From: Jakob Meng <code@jakobmeng.de>
Date: Thu, 24 Nov 2022 11:13:08 +0100
Subject: [PATCH] Adapt openstack.cloud.catalog_service calls to Ansible
 OpenStack Col.>=2.0.0

Change-Id: Ia2d96552e302b861a2df65f34137ad6c55973770
---
 .../bifrost-ironic-install/tasks/keystone_setup.yml  |  6 +++---
 .../tasks/keystone_setup_inspector.yml               |  6 +++---
 .../roles/bifrost-keystone-install/tasks/upgrade.yml | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml b/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml
index a574e2fbd..fe99e2d47 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml
@@ -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') }}"
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup_inspector.yml b/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup_inspector.yml
index f8a098a8e..6f052af41 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup_inspector.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/keystone_setup_inspector.yml
@@ -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') }}"
diff --git a/playbooks/roles/bifrost-keystone-install/tasks/upgrade.yml b/playbooks/roles/bifrost-keystone-install/tasks/upgrade.yml
index 74ae85c61..57d17896a 100644
--- a/playbooks/roles/bifrost-keystone-install/tasks/upgrade.yml
+++ b/playbooks/roles/bifrost-keystone-install/tasks/upgrade.yml
@@ -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