diff --git a/inventory/group_vars/copr_back_aws b/inventory/group_vars/copr_back_aws index e142fcb80c..8390f2afff 100644 --- a/inventory/group_vars/copr_back_aws +++ b/inventory/group_vars/copr_back_aws @@ -66,3 +66,6 @@ nagios_Check_Services: swap: false # There is no python2 on F30 + +# what is the main backend service name +copr_backend_target: copr-backend.service diff --git a/inventory/group_vars/copr_back_dev_aws b/inventory/group_vars/copr_back_dev_aws index 8e16905f8c..1973a5da5b 100644 --- a/inventory/group_vars/copr_back_dev_aws +++ b/inventory/group_vars/copr_back_dev_aws @@ -63,3 +63,6 @@ copr_hostbase: copr-be-dev _copr_be_conf: copr-be.conf-dev datacenter: aws + +# what is the main backend service name +copr_backend_target: copr-backend.target diff --git a/roles/copr/backend/handlers/main.yml b/roles/copr/backend/handlers/main.yml index 0a7c9c495a..2378004dc0 100644 --- a/roles/copr/backend/handlers/main.yml +++ b/roles/copr/backend/handlers/main.yml @@ -2,7 +2,7 @@ file: path=/etc/lighttpd/copr-be.fedoraproject.org.pem owner=root group=root mode=0600 - name: restart copr-backend - service: name=copr-backend state=restarted + service: name="{{ copr_backend_target }} state=restarted when: not services_disabled - name: systemctl daemon-reload diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 050eff4905..7a83161e51 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -274,7 +274,7 @@ when: not services_disabled|bool with_items: - redis # TODO: .service in copr-backend should depend on redis - - copr-backend + - "{{ copr_backend_target }}" - name: install aws cleaning script copy: src="cleanup-vms-aws" dest=/usr/local/bin/ mode=755