From 7ba67fdc1221b5937be9491a51beb7dbb8641a67 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 6 Jul 2022 10:42:26 -0700 Subject: [PATCH] openQA: don't enable FedoraUpdateRestart plugin Upstream implemented a feature that we can use to do the same thing using just a test variable, so we're switching to that. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa | 2 +- inventory/group_vars/openqa_lab | 2 +- inventory/group_vars/openqa_onebox_test | 1 - roles/openqa/server/defaults/main.yml | 3 +-- roles/openqa/server/tasks/main.yml | 11 +++++------ 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index f8104ae545..41400966d4 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -21,7 +21,7 @@ openqa_resultsdb_user: "{{ prod_resultsdb_httpd_user }}" openqa_resultsdb_password: "{{ prod_resultsdb_httpd_password }}" openqa_secret: "{{ prod_openqa_apisecret }}" openqa_update_arches: ['x86_64'] -openqa_webapi_plugins: FedoraMessaging FedoraUpdateRestart +openqa_webapi_plugins: FedoraMessaging openqa_wikitcms_hostname: fedoraproject.org virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough,+vmx" wikitcms_token: "{{ private }}/files/openidc/production/wikitcms.json" diff --git a/inventory/group_vars/openqa_lab b/inventory/group_vars/openqa_lab index 9b6cf64a5f..9aa594039e 100644 --- a/inventory/group_vars/openqa_lab +++ b/inventory/group_vars/openqa_lab @@ -45,6 +45,6 @@ openqa_resultsdb_user: "{{ stg_resultsdb_httpd_user }}" openqa_resultsdb_password: "{{ stg_resultsdb_httpd_password }}" openqa_secret: "{{ stg_openqa_apisecret }}" openqa_update_arches: ['x86_64', 'ppc64le'] -openqa_webapi_plugins: FedoraMessaging FedoraUpdateRestart +openqa_webapi_plugins: FedoraMessaging openqa_wikitcms_hostname: stg.fedoraproject.org wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json" diff --git a/inventory/group_vars/openqa_onebox_test b/inventory/group_vars/openqa_onebox_test index 3d2503a01f..b35f79bf36 100644 --- a/inventory/group_vars/openqa_onebox_test +++ b/inventory/group_vars/openqa_onebox_test @@ -43,7 +43,6 @@ openqa_key: "{{ stg_openqa_apikey }}" openqa_repo: updates-testing openqa_secret: "{{ stg_openqa_apisecret }}" openqa_update_arches: ['x86_64'] -openqa_webapi_plugins: FedoraUpdateRestart # copied from openqa_servers_common, we don't want everything from there though ipa_client_shell_groups: diff --git a/roles/openqa/server/defaults/main.yml b/roles/openqa/server/defaults/main.yml index 534491ffe2..c12a4ba4af 100644 --- a/roles/openqa/server/defaults/main.yml +++ b/roles/openqa/server/defaults/main.yml @@ -1,5 +1,4 @@ -openqa_webapi_plugins: FedoraUpdateRestart -openqa_amqp_publisher_prefix: +openqa_amqp_publisher_prefix: openqa_amqp_publisher_url: amqp://test:@localhost/%2Fpubsub openqa_amqp_publisher_exchange: amq.topic openqa_repo: updates diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 33a19746c0..7b83c46b7d 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -16,12 +16,6 @@ # - external_hostname ## string - The public hostname for the server (will be used as ServerName) ## default - ansible_nodename -# - openqa_webapi_plugins -## string - Space-separated list of openQA WebAPI plugins to enable -## Note if you enable FedoraMessaging or AMQP plugins, you should -## also set openqa_amqp_publisher_prefix, openqa_amqp_publisher_url -## and openqa_amqp_publisher_exchange -## default - FedoraUpdateRestart # - openqa_repo ## string - Repo to enable when updating openQA packages. Set to ## 'updates-testing' to use packages from updates-testing @@ -68,6 +62,11 @@ ## publish request, by just appending them, e.g. ## amq.topic&cacertfile=/path/to/ca_certificate_file ## default - amq.topic +# - openqa_webapi_plugins +## string - Space-separated list of openQA WebAPI plugins to enable +## Note if you enable FedoraMessaging or AMQP plugins, you should +## also set openqa_amqp_publisher_prefix, openqa_amqp_publisher_url +## and openqa_amqp_publisher_exchange # - deployment_type ## string - Fedora Infrastructure thing; for this role, applies an ## infra-specific tweak to httpd config. Don't set it outside