diff --git a/roles/openshift-apps/release-monitoring/files/cron.yml b/roles/openshift-apps/release-monitoring/files/cron.yml index 08dbed0008..919bb9e18c 100644 --- a/roles/openshift-apps/release-monitoring/files/cron.yml +++ b/roles/openshift-apps/release-monitoring/files/cron.yml @@ -15,7 +15,7 @@ spec: containers: - name: release-monitoring-web image: docker-registry.default.svc:5000/release-monitoring/release-monitoring-web:latest - command: ["bash", "-c", "fedmsg-tail& /usr/local/bin/anitya_cron.py > /dev/null"] + command: ["bash", "-c", "/usr/local/bin/anitya_cron.py"] env: - name: ANITYA_WEB_CONFIG value: /etc/anitya/anitya.toml diff --git a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml index 82091d0c25..b9ceaf8732 100644 --- a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml +++ b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml @@ -41,6 +41,8 @@ items: env: - name: USER value: anitya + - name: ANITYA_WEB_CONFIG + value: /etc/anitya/anitya.toml ports: - containerPort: 8080 resources: {} @@ -120,11 +122,12 @@ items: containers: - name: fedmsg-hub image: release-monitoring/release-monitoring-web:latest - command: - - fedmsg-hub + command: ["fedmsg-hub", "--config-filename", "/etc/fedmsg.d/anitya.py"] env: - name: USER value: fedmsg + - name: ANITYA_WEB_CONFIG + value: /etc/anitya/anitya.toml resources: {} volumeMounts: - name: config-volume diff --git a/roles/openshift-apps/release-monitoring/templates/configmap.yml b/roles/openshift-apps/release-monitoring/templates/configmap.yml index 541654ec98..9651345e49 100644 --- a/roles/openshift-apps/release-monitoring/templates/configmap.yml +++ b/roles/openshift-apps/release-monitoring/templates/configmap.yml @@ -91,17 +91,17 @@ items: stream = "ext://sys.stdout" [anitya_log_config.loggers.anitya] - level = "INFO" + level = "DEBUG" propagate = false handlers = ["console"] [anitya_log_config.loggers.fedmsg] - level = "INFO" + level = "DEBUG" propagate = false handlers = ["console"] [anitya_log_config.root] - level = "ERROR" + level = "DEBUG" handlers = ["console"] alembic.ini: |- [alembic] @@ -252,7 +252,7 @@ items: import socket config = { "zmq_enabled": True, - "active": False, + "active": True, "topic_prefix": "org.fedoraproject", "sign_messages": True, "validate_signatures": True, @@ -264,8 +264,10 @@ items: {% if env == 'staging' %} "endpoints": {"anitya.stg": "tcp://busgateway01.stg.phx2.fedoraproject.org:9940"}, "environment": "stg", + "relay_inbound": ["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"], {% else %} "endpoints": {"anitya.prod": "tcp://busgateway01.phx2.fedoraproject.org:9940"}, "environment": "prod", + "relay_inbound": ["tcp://busgateway01.phx2.fedoraproject.org:9941"], {% endif %} }