From a2800f0d284eaf0b1749dc761d3ecb388fed3bfd Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 19 Oct 2022 12:52:03 +0200 Subject: [PATCH] Add deployment of tacker-scheduler There's a long-standing bug from 2017 that tacker requires scheduler service to run. However it seemed no real interest to tacker among OSA users. Nevertheless it's better late then never fixing it. Change-Id: I70264ef5ffd6ebb851e4d3c4c86c28ea222f7139 Closes-Bug: #1710874 --- defaults/main.yml | 18 ++++++++++++++++++ tasks/main.yml | 7 +------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a126323..ad8f516 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -111,6 +111,7 @@ tacker_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | de tacker_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" tacker_service_port: 9890 tacker_program_name: tacker-server +tacker_conductor_program_name: tacker-conductor ## Service Type and Data tacker_service_region: "{{ service_region | default('RegionOne') }}" @@ -129,6 +130,21 @@ tacker_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default( tacker_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(tacker_service_proto) }}" tacker_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(tacker_service_proto) }}" +tacker_services: + tacker-server: + group: tacker_server + service_name: "{{ tacker_service_name }}" + enabled: yes + state: started + execstarts: "{{ tacker_bin }}/{{ tacker_program_name }} {{ tacker_config_options|default('') }}" + config_overrides: "{{ tacker_init_config_overrides }}" + tacker-conductor: + group: tacker_server + service_name: "{{ tacker_conductor_program_name }}" + enabled: yes + execstarts: "{{ tacker_bin }}/{{ tacker_conductor_program_name }} {{ tacker_conductor_config_options|default('') }}" + config_overrides: "{{ tacker_conductor_init_config_overrides }}" + ## Barbican service barbican_keys_backend: false @@ -161,7 +177,9 @@ tacker_pip_packages: - "git+{{ tacker_git_repo }}@{{ tacker_git_install_branch }}#egg=tacker" tacker_config_options: --config-file {{ tacker_etc_dir }}/tacker.conf +tacker_conductor_config_options: "{{ tacker_config_options }}" tacker_init_config_overrides: {} +tacker_conductor_init_config_overrides: {} ## tacker config tacker_heat_stack_retires: 60 diff --git a/tasks/main.yml b/tasks/main.yml index c796844..9707109 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -112,12 +112,7 @@ systemd_BlockIOAccounting: true systemd_MemoryAccounting: true systemd_TasksAccounting: true - systemd_services: - - service_name: "{{ tacker_service_name }}" - enabled: yes - state: started - execstarts: "{{ tacker_bin }}/{{ tacker_program_name }} {{ tacker_config_options|default('') }}" - config_overrides: "{{ tacker_init_config_overrides }}" + systemd_services: "{{ tacker_services.values() }}" tags: - systemd-service - tacker-install