From 0aeda2bb5a08a19292d1fe359006b633062ff3a1 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 24 Sep 2024 15:37:24 +0200 Subject: [PATCH] Rename Masakari service type Project documentation suggests Masakari to have `instance-ha` service type, which is good to align on. Other deployment tools do use that service type as well. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-openstack_hosts/+/930272 Change-Id: Icdc07fbba1a0768ebb706847d5f4b426ec3c315c --- defaults/main.yml | 2 +- .../notes/masakari_service_type_rename-4a86255372f8a3b5.yaml | 5 +++++ tasks/main.yml | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/masakari_service_type_rename-4a86255372f8a3b5.yaml diff --git a/defaults/main.yml b/defaults/main.yml index aa2e5bd..f9ed1bd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -116,7 +116,7 @@ masakari_service_registry_proto: "{{ masakari_service_proto }}" masakari_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(masakari_service_proto) }}" masakari_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(masakari_service_proto) }}" masakari_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(masakari_service_proto) }}" -masakari_service_type: ha +masakari_service_type: instance-ha masakari_service_description: "Masakari ha Service" masakari_service_user_name: masakari masakari_service_project_name: service diff --git a/releasenotes/notes/masakari_service_type_rename-4a86255372f8a3b5.yaml b/releasenotes/notes/masakari_service_type_rename-4a86255372f8a3b5.yaml new file mode 100644 index 0000000..2e2d2b6 --- /dev/null +++ b/releasenotes/notes/masakari_service_type_rename-4a86255372f8a3b5.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Service type in catalog has been changed from ``ha`` to ``instance-ha`` + in order to align service types with `service deployment guide `_ diff --git a/tasks/main.yml b/tasks/main.yml index c758183..002f124 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -196,6 +196,10 @@ - name: "{{ masakari_service_name }}" type: "{{ masakari_service_type }}" description: "{{ masakari_service_description }}" + # TODO(noonedeadpunk): Remove after Epoxy release + - name: "{{ masakari_service_name }}" + type: "ha" + state: absent when: - "_masakari_is_first_play_host" tags: