From 4885069d12308bd8fc4cb81d400b48e835a2e229 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 22 Feb 2017 15:40:59 +0000 Subject: [PATCH] Remove old dev config, no longer needed. This stuff was for https://fedorahosted.org/rel-eng/ticket/6441 --- .../host_vars/composer.stg.phx2.fedoraproject.org | 5 ----- roles/fedmsg/base/tasks/main.yml | 1 + .../templates/endpoints-external-composer.py.j2 | 13 ------------- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 roles/fedmsg/base/templates/endpoints-external-composer.py.j2 diff --git a/inventory/host_vars/composer.stg.phx2.fedoraproject.org b/inventory/host_vars/composer.stg.phx2.fedoraproject.org index da47c2649f..c5e24da78f 100644 --- a/inventory/host_vars/composer.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/composer.stg.phx2.fedoraproject.org @@ -21,11 +21,6 @@ kojihub_scheme: http virt_install_command: "{{ virt_install_command_two_nic }}" -# This line should be removed whenever the modularity-wg is done doing its tests -# on composer.stg. -# See: https://fedorahosted.org/rel-eng/ticket/6441 -fedmsg_validate_signatures: False - # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index fc1ccd6583..be9a8fc084 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -83,6 +83,7 @@ - endpoints-elections.py - endpoints-fmn-web.py - pkgdb.py + - endpoints-external-composer.py tags: - config - fedmsgdconfig diff --git a/roles/fedmsg/base/templates/endpoints-external-composer.py.j2 b/roles/fedmsg/base/templates/endpoints-external-composer.py.j2 deleted file mode 100644 index a00b8378a6..0000000000 --- a/roles/fedmsg/base/templates/endpoints-external-composer.py.j2 +++ /dev/null @@ -1,13 +0,0 @@ -# This file was added in order to allow modularity developers to bridge the -# staging bus with the modularity development server in the cloud. -# If the modularity development work on composer.stg.phx2.fp.o is done, this -# file and its references in ansible can be removed. -# See https://fedorahosted.org/rel-eng/ticket/6441 -# Ralph Bean