diff --git a/inventory/group_vars/librariesio2fedmsg-stg b/inventory/group_vars/librariesio2fedmsg-stg deleted file mode 100644 index 3eb3224109..0000000000 --- a/inventory/group_vars/librariesio2fedmsg-stg +++ /dev/null @@ -1,12 +0,0 @@ ---- -# XXX - this is not really a group of real hosts. -# Instead, it represents an application in openshift. -# See playbooks/openshift-apps/waiverdb.yml - -fedmsg_env: stg - -fedmsg_certs: -- service: librariesio2fedmsg - can_send: - - librariesio2fedmsg.sse2fedmsg.librariesio - - librariesio.sse2fedmsg diff --git a/inventory/inventory b/inventory/inventory index df9d1c63f1..03c126a6e6 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1468,12 +1468,10 @@ bodhi-backend01.phx2.fedoraproject.org greenwave waiverdb bodhi2 -#librariesio2fedmsg [openshift-pseudohosts-stg:children] greenwave-stg waiverdb-stg -librariesio2fedmsg-stg [bodhi2] bodhi-web-temp-bodhi.app.os.fedoraproject.org @@ -1493,9 +1491,6 @@ waiverdb-web-waiverdb.app.os.fedoraproject.org [waiverdb-stg] waiverdb-web-waiverdb.app.os.stg.fedoraproject.org -[librariesio2fedmsg-stg] -librariesio2fedmsg-librariesio2fedmsg.app.os.stg.fedoraproject.org - [sar] badges-backend01.phx2.fedoraproject.org bodhi-backend02.phx2.fedoraproject.org diff --git a/playbooks/openshift-apps/librariesio2fedmsg.yml b/playbooks/openshift-apps/librariesio2fedmsg.yml deleted file mode 100644 index 2e8c2dab54..0000000000 --- a/playbooks/openshift-apps/librariesio2fedmsg.yml +++ /dev/null @@ -1,62 +0,0 @@ -- name: make the app be real - hosts: os-masters-stg[0] - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - role: openshift/project - app: librariesio2fedmsg - description: librariesio2fedmsg - appowners: - - jcline - - role: openshift/secret-file - app: librariesio2fedmsg - secret_name: librariesio2fedmsg-fedmsg-key - key: fedmsg-librariesio2fedmsg.key - privatefile: fedmsg-certs/keys/librariesio2fedmsg-librariesio2fedmsg.app.os.fedoraproject.org.key - when: env != "staging" - - role: openshift/secret-file - app: librariesio2fedmsg - secret_name: librariesio2fedmsg-fedmsg-crt - key: fedmsg-librariesio2fedmsg.crt - privatefile: fedmsg-certs/keys/librariesio2fedmsg-librariesio2fedmsg.app.os.fedoraproject.org.crt - when: env != "staging" - - role: openshift/secret-file - app: librariesio2fedmsg - secret_name: librariesio2fedmsg-fedmsg-key - key: fedmsg-librariesio2fedmsg.key - privatefile: fedmsg-certs/keys/librariesio2fedmsg-librariesio2fedmsg.app.os.stg.fedoraproject.key - when: env == "staging" - - role: openshift/secret-file - app: librariesio2fedmsg - secret_name: librariesio2fedmsg-fedmsg-crt - key: fedmsg-librariesio2fedmsg.crt - privatefile: fedmsg-certs/keys/librariesio2fedmsg-librariesio2fedmsg.app.os.stg.fedoraproject.crt - when: env == "staging" - - role: openshift/object - app: librariesio2fedmsg - file: imagestream.yml - objectname: imagestream.yml - - role: openshift/object - app: librariesio2fedmsg - file: buildconfig.yml - objectname: buildconfig.yml - - role: openshift/start-build - app: librariesio2fedmsg - buildname: sse2fedmsg-docker-build - - role: openshift/object - app: librariesio2fedmsg - template: configmap.yml - objectname: configmap.yml - - role: openshift/object - app: librariesio2fedmsg - file: deploymentconfig.yml - objectname: deploymentconfig.yml - - role: openshift/rollout - app: librariesio2fedmsg - dcname: librariesio2fedmsg diff --git a/roles/openshift-apps/librariesio2fedmsg/files/buildconfig.yml b/roles/openshift-apps/librariesio2fedmsg/files/buildconfig.yml deleted file mode 100644 index 66347b9b52..0000000000 --- a/roles/openshift-apps/librariesio2fedmsg/files/buildconfig.yml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: v1 -items: -- apiVersion: v1 - kind: BuildConfig - metadata: - labels: - build: sse2fedmsg - name: sse2fedmsg-docker-build - spec: - runPolicy: Serial - source: - dockerfile: |- - FROM fedora:27 - LABEL \ - name="sse2fedmsg" \ - vendor="Fedora Infrastructure" \ - license="MIT" - RUN dnf -y --enablerepo updates-testing update && \ - dnf -y --enablerepo updates-testing install \ - git \ - python3-pip \ - python3-fedmsg \ - python3-sseclient && \ - dnf clean all - RUN pip-3 install git+https://github.com/fedora-infra/sse2fedmsg.git - RUN rm /etc/fedmsg.d/*py - RUN mkdir -p /etc/pki/fedmsg/ - RUN ln -sf /etc/pki/fedmsg/key/fedmsg-librariesio2fedmsg.key /etc/pki/fedmsg/librariesio2fedmsg.key - RUN ln -sf /etc/pki/fedmsg/crt/fedmsg-librariesio2fedmsg.crt /etc/pki/fedmsg/librariesio2fedmsg.crt - ENV USER=librariesio2fedmsg - RUN chmod 777 /var/run/fedmsg/ - ENTRYPOINT sse2fedmsg librariesio http://firehose.libraries.io/events - type: Dockerfile - strategy: - type: Docker - output: - to: - kind: ImageStreamTag - name: sse2fedmsg:latest -kind: List -metadata: {} diff --git a/roles/openshift-apps/librariesio2fedmsg/files/deploymentconfig.yml b/roles/openshift-apps/librariesio2fedmsg/files/deploymentconfig.yml deleted file mode 100644 index b7b88cee07..0000000000 --- a/roles/openshift-apps/librariesio2fedmsg/files/deploymentconfig.yml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: v1 -items: -- apiVersion: v1 - kind: DeploymentConfig - metadata: - labels: - app: librariesio2fedmsg - service: fedmsg - name: librariesio2fedmsg - spec: - replicas: 1 - selector: - deploymentconfig: librariesio2fedmsg - strategy: - activeDeadlineSeconds: 21600 - recreateParams: - timeoutSeconds: 600 - resources: {} - rollingParams: - intervalSeconds: 1 - maxSurge: 25% - maxUnavailable: 25% - timeoutSeconds: 600 - updatePeriodSeconds: 1 - type: Rolling - template: - metadata: - creationTimestamp: null - labels: - app: librariesio2fedmsg - deploymentconfig: librariesio2fedmsg - spec: - containers: - - name: librariesio2fedmsg - image: librariesio2fedmsg/sse2fedmsg:latest - volumeMounts: - - name: fedmsg-config-volume - mountPath: /etc/fedmsg.d/ - readOnly: true - - name: fedmsg-key-volume - mountPath: /etc/pki/fedmsg/key - readOnly: true - - name: fedmsg-crt-volume - mountPath: /etc/pki/fedmsg/crt - readOnly: true - volumes: - - name: fedmsg-config-volume - configMap: - name: fedmsg-config - - name: fedmsg-key-volume - secret: - secretName: librariesio2fedmsg-fedmsg-key - - name: fedmsg-crt-volume - secret: - secretName: librariesio2fedmsg-fedmsg-crt - triggers: - - imageChangeParams: - automatic: true - containerNames: - - librariesio2fedmsg - from: - kind: ImageStreamTag - name: sse2fedmsg:latest - namespace: librariesio2fedmsg - type: ImageChange - - type: ConfigChange -kind: List -metadata: {} diff --git a/roles/openshift-apps/librariesio2fedmsg/files/imagestream.yml b/roles/openshift-apps/librariesio2fedmsg/files/imagestream.yml deleted file mode 100644 index ee14e0098d..0000000000 --- a/roles/openshift-apps/librariesio2fedmsg/files/imagestream.yml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -items: -- apiVersion: v1 - kind: ImageStream - metadata: - name: sse2fedmsg - labels: - build: sse2fedmsg -kind: List -metadata: {} diff --git a/roles/openshift-apps/librariesio2fedmsg/templates/configmap.yml b/roles/openshift-apps/librariesio2fedmsg/templates/configmap.yml deleted file mode 100644 index a4d3b6fb45..0000000000 --- a/roles/openshift-apps/librariesio2fedmsg/templates/configmap.yml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: v1 -items: -- apiVersion: v1 - data: - librariesio2fedmsg.py: |- - import socket - config = dict( - topic_prefix='org.fedoraproject', - zmq_enabled=True, - endpoints={}, - # Openshift requires that we relay through the fedmsg relay because we don't - # know our hostname. - active=True, - {% if env == 'staging' %} - environment='stg', - relay_inbound=["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"], - {% else %} - environment='prod', - relay_inbound=["tcp://busgateway01.phx2.fedoraproject.org:9941"], - {% endif %} - sign_messages=True, - ssldir='/etc/pki/fedmsg/', - cert_prefix="librariesio2fedmsg", - certnames={ - "librariesio2fedmsg." + socket.gethostname(): "librariesio2fedmsg", - }, - ) - kind: ConfigMap - metadata: - creationTimestamp: null - name: fedmsg-config -kind: List -metadata: {}