diff --git a/roles/pagure/frontend/tasks/main.yml b/roles/pagure/frontend/tasks/main.yml index 65f79c676a..21b3c12de7 100644 --- a/roles/pagure/frontend/tasks/main.yml +++ b/roles/pagure/frontend/tasks/main.yml @@ -194,7 +194,6 @@ copy: src={{ item }}.service dest=/etc/systemd/system/{{ item }}.service owner=root group=root mode=0755 - when: env == 'pagure-staging' with_items: - pagure_fast_worker - pagure_medium_worker @@ -386,6 +385,9 @@ - pagure_webhook - pagure_worker - pagure_gitolite_worker + - pagure_fast_worker + - pagure_medium_worker + - pagure_slow_worker - fedmsg-relay - haveged ignore_errors: true @@ -393,16 +395,3 @@ - pagure - service - postfix - -- name: Start and enable the worker services - service: name={{ item }} enabled=yes state=started - with_items: - - pagure_fast_worker - - pagure_medium_worker - - pagure_slow_worker - when: env == 'pagure-staging' - ignore_errors: true - tags: - - pagure - - service - - postfix diff --git a/roles/pagure/frontend/templates/pagure.cfg b/roles/pagure/frontend/templates/pagure.cfg index a0350a68ff..f20c2b9431 100644 --- a/roles/pagure/frontend/templates/pagure.cfg +++ b/roles/pagure/frontend/templates/pagure.cfg @@ -286,9 +286,6 @@ CROSS_PROJECT_ACLS = [ BLACKLISTED_GROUPS = ['forks', 'group', 'rpms', 'modules', 'container', 'tests'] GITOLITE_CELERY_QUEUE = 'gitolite_queue' -{% if env == 'pagure-staging' %} FAST_CELERY_QUEUE = 'fast_workers' MEDIUM_CELERY_QUEUE = 'medium_workers' SLOW_CELERY_QUEUE = 'slow_workers' -{% else %} -{% endif %}