Do not collect gnocchi project ID

Ceilometer middleware now accepts also project names,
so it's not required to gain project UUID [1].

We also switching gnocchi project name to `service` for all scenarios
as it's already whitelisted by default [2]

[1] e2bf485044
[2] 082dabb1b7/ceilometermiddleware/swift.py (L158)

Closes-Bug: #1879192
Change-Id: I40d3178d1b3bd1234ac34c6fa1d0d2bcb7160720
This commit is contained in:
Dmitriy Rabotyagov 2021-05-13 17:34:08 +03:00 committed by Dmitriy Rabotyagov
parent d425a94865
commit 2ce00d6c69
4 changed files with 17 additions and 25 deletions

View File

@ -15,7 +15,6 @@
# Enable/Disable Telemetry projects
swift_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
swift_gnocchi_enabled: "{{ (groups['gnocchi_all'] is defined) and (groups['gnocchi_all'] | length > 0) }}"
## Verbosity Options
debug: False

View File

@ -0,0 +1,6 @@
---
deprecations:
- |
Variable `swift_gnocchi_enabled` has been removed and won't have any
effect

View File

@ -13,28 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Define Gnocchi project id
delegate_to: "{{ swift_service_setup_host }}"
vars:
ansible_python_interpreter: "{{ swift_service_setup_host_python_interpreter }}"
block:
- name: Get Gnocchi project id
openstack.cloud.os_project_info:
name: "{{ gnocchi_service_project_name }}"
interface: "{{ keystone_service_adminurl }}"
verify: "{{ keystone_service_adminuri_insecure }}"
register: get_gnocchi_project
until: get_gnocchi_project is success
retries: 5
delay: 10
no_log: True
- name: Store Gnocchi project id
set_fact:
swift_gnocchi_service_project_id: "{{ get_gnocchi_project.openstack_projects[0].id }}"
when:
- swift_gnocchi_enabled | bool
- name: swift proxy server configuration
config_template:
src: "proxy-server.conf.j2"

View File

@ -170,8 +170,17 @@ driver = messagingv2
url = {{ swift_oslomsg_notify_transport }}://{% for host in swift_oslomsg_notify_servers.split(',') %}{{ swift_oslomsg_notify_userid }}:{{ swift_oslomsg_notify_password }}@{{ host }}:{{ swift_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ swift_oslomsg_notify_vhost }}{% endif %}{% endfor %}
topic = notifications
{% if swift_gnocchi_service_project_id is defined %}
ignore_projects = {{ swift_gnocchi_service_project_id }}
{% if gnocchi_service_project_name is defined %}
ignore_projects = {{ gnocchi_service_project_name }}
auth_type = {{ swift_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }}
insecure = {{ keystone_service_adminuri_insecure | bool }}
region_name = {{ keystone_service_region }}
project_domain_id = {{ swift_service_project_domain_id }}
user_domain_id = {{ swift_service_user_domain_id }}
project_name = {{ swift_service_project_name }}
username = {{ swift_service_user_name }}
password = {{ swift_service_password }}
{% endif %}
log_level = WARN
{% endif %}