From 58932984ff360e95644c741f49413615575a610f Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Dec 09 2024 16:36:39 +0000 Subject: Don't start fedmsg in staging Signed-off-by: Aurélien Bompard --- diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index f2a8be8..19ce2b2 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -148,7 +148,7 @@ object_objectname: service.yml - role: openshift/object object_app: messaging-bridges - object_file: deploymentconfig.yml + object_template: deploymentconfig.yml object_objectname: deploymentconfig.yml - role: openshift/rollout diff --git a/roles/fedmsg/gateway/tasks/main.yml b/roles/fedmsg/gateway/tasks/main.yml index 361a40f..6a6196f 100644 --- a/roles/fedmsg/gateway/tasks/main.yml +++ b/roles/fedmsg/gateway/tasks/main.yml @@ -42,7 +42,21 @@ - restart fedmsg-gateway - name: enable on boot and start fedmsg-gateway - service: name=fedmsg-gateway state=started enabled=true + service: + name: fedmsg-gateway + state: started + enabled: true tags: - services - fedmsg/gateway + when: env != "staging" + +- name: disable fedmsg-gateway on staging + service: + name: fedmsg-gateway + state: stopped + enabled: false + tags: + - services + - fedmsg/gateway + when: env == "staging" diff --git a/roles/fedmsg/hub/tasks/main.yml b/roles/fedmsg/hub/tasks/main.yml index a5a0236..98743f5 100644 --- a/roles/fedmsg/hub/tasks/main.yml +++ b/roles/fedmsg/hub/tasks/main.yml @@ -19,7 +19,11 @@ - name: fedmsg-hub service service: name=fedmsg-hub state=started enabled=yes - when: "'python34_fedmsg' not in group_names" + when: "'python34_fedmsg' not in group_names and env == 'production'" + +- name: fedmsg-hub service + service: name=fedmsg-hub state=stopped enabled=no + when: "'python34_fedmsg' not in group_names and env == 'staging'" - name: fedmsg-hub-3 service service: name=fedmsg-hub-3 state=started enabled=yes diff --git a/roles/fedmsg/relay/tasks/main.yml b/roles/fedmsg/relay/tasks/main.yml index 39b0c2d..c347d24 100644 --- a/roles/fedmsg/relay/tasks/main.yml +++ b/roles/fedmsg/relay/tasks/main.yml @@ -34,3 +34,13 @@ - fedmsg/relay notify: - restart fedmsg-relay + when: env != "staging" + +- name: enable on boot and start fedmsg-relay + service: name=fedmsg-relay state=stopped enabled=false + tags: + - services + - fedmsg/relay + notify: + - restart fedmsg-relay + when: env == "staging" diff --git a/roles/openshift-apps/messaging-bridges/files/deploymentconfig.yml b/roles/openshift-apps/messaging-bridges/files/deploymentconfig.yml deleted file mode 100644 index 3fb85c6..0000000 --- a/roles/openshift-apps/messaging-bridges/files/deploymentconfig.yml +++ /dev/null @@ -1,234 +0,0 @@ ---- -apiVersion: apps.openshift.io/v1 -kind: List -metadata: {} -items: -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - labels: - app: messaging-bridges - name: amqp-to-zmq - spec: - replicas: 1 - selector: - deploymentconfig: amqp-to-zmq - strategy: - resources: {} - template: - metadata: - labels: - app: messaging-bridges - deploymentconfig: amqp-to-zmq - spec: - containers: - - name: fedmsg-migration-tools - image: fedmsg-migration-tools:latest - env: - - name: APP_SCRIPT - value: "./.s2i/amqp-to-zmq" - - name: FEDORA_MESSAGING_CONF - value: "/etc/fedora-messaging/amqp-to-zmq.toml" - volumeMounts: - - name: config-volume - mountPath: /etc/fedora-messaging/ - readOnly: true - - 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 - - name: rabbitmq-ca-volume - mountPath: /etc/pki/rabbitmq/ca - readOnly: true - - name: rabbitmq-key-volume - mountPath: /etc/pki/rabbitmq/key - readOnly: true - - name: rabbitmq-crt-volume - mountPath: /etc/pki/rabbitmq/crt - readOnly: true - volumes: - - name: config-volume - configMap: - name: fedora-messaging-configmap - - name: fedmsg-config-volume - configMap: - name: fedmsg-configmap - - name: fedmsg-key-volume - secret: - secretName: fedmsg-key - - name: fedmsg-crt-volume - secret: - secretName: fedmsg-cert - - name: rabbitmq-ca-volume - secret: - secretName: rabbitmq-ca - - name: rabbitmq-key-volume - secret: - secretName: rabbitmq-key - - name: rabbitmq-crt-volume - secret: - secretName: rabbitmq-cert - - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - fedmsg-migration-tools - from: - kind: ImageStreamTag - name: fedmsg-migration-tools:latest ---- -apiVersion: apps.openshift.io/v1 -kind: List -metadata: {} -items: -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - labels: - app: messaging-bridges - name: zmq-to-amqp - spec: - replicas: 1 - selector: - deploymentconfig: zmq-to-amqp - strategy: - resources: {} - template: - metadata: - labels: - app: messaging-bridges - deploymentconfig: zmq-to-amqp - spec: - containers: - - name: fedmsg-migration-tools - image: fedmsg-migration-tools:latest - env: - - name: APP_SCRIPT - value: "./.s2i/zmq-to-amqp" - - name: FEDMSG_MIGRATION_TOOLS_CONF - value: "/etc/fedora-messaging/zmq-to-amqp.toml" - volumeMounts: - - name: config-volume - mountPath: /etc/fedora-messaging/ - readOnly: true - - name: fedmsg-config-volume - mountPath: /etc/fedmsg.d/ - readOnly: true - - name: rabbitmq-ca-volume - mountPath: /etc/pki/rabbitmq/ca - readOnly: true - - name: rabbitmq-key-volume - mountPath: /etc/pki/rabbitmq/key - readOnly: true - - name: rabbitmq-crt-volume - mountPath: /etc/pki/rabbitmq/crt - readOnly: true - volumes: - - name: config-volume - configMap: - name: fedora-messaging-configmap - - name: fedmsg-config-volume - configMap: - name: fedmsg-configmap - - name: rabbitmq-ca-volume - secret: - secretName: rabbitmq-ca - - name: rabbitmq-key-volume - secret: - secretName: rabbitmq-key - - name: rabbitmq-crt-volume - secret: - secretName: rabbitmq-cert - - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - fedmsg-migration-tools - from: - kind: ImageStreamTag - name: fedmsg-migration-tools:latest ---- -apiVersion: apps.openshift.io/v1 -kind: List -metadata: {} -items: -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - labels: - app: messaging-bridges - name: verify-missing - spec: - replicas: 1 - selector: - deploymentconfig: verify-missing - strategy: - resources: {} - template: - metadata: - labels: - app: messaging-bridges - deploymentconfig: verify-missing - spec: - containers: - - name: fedmsg-migration-tools - image: fedmsg-migration-tools:latest - env: - - name: APP_SCRIPT - value: "./.s2i/verify-missing" - - name: FEDMSG_MIGRATION_TOOLS_CONF - value: "/etc/fedora-messaging/verify-missing.toml" - volumeMounts: - - name: config-volume - mountPath: /etc/fedora-messaging/ - readOnly: true - - name: fedmsg-config-volume - mountPath: /etc/fedmsg.d/ - readOnly: true - - name: rabbitmq-ca-volume - mountPath: /etc/pki/rabbitmq/ca - readOnly: true - - name: rabbitmq-key-volume - mountPath: /etc/pki/rabbitmq/key - readOnly: true - - name: rabbitmq-crt-volume - mountPath: /etc/pki/rabbitmq/crt - readOnly: true - volumes: - - name: config-volume - configMap: - name: fedora-messaging-configmap - - name: fedmsg-config-volume - configMap: - name: fedmsg-configmap - - name: rabbitmq-ca-volume - secret: - secretName: rabbitmq-ca - - name: rabbitmq-key-volume - secret: - secretName: rabbitmq-key - - name: rabbitmq-crt-volume - secret: - secretName: rabbitmq-cert - - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - fedmsg-migration-tools - from: - kind: ImageStreamTag - name: fedmsg-migration-tools:latest diff --git a/roles/openshift-apps/messaging-bridges/templates/deploymentconfig.yml b/roles/openshift-apps/messaging-bridges/templates/deploymentconfig.yml new file mode 100644 index 0000000..98e29c4 --- /dev/null +++ b/roles/openshift-apps/messaging-bridges/templates/deploymentconfig.yml @@ -0,0 +1,234 @@ +--- +apiVersion: apps.openshift.io/v1 +kind: List +metadata: {} +items: +- apiVersion: apps.openshift.io/v1 + kind: DeploymentConfig + metadata: + labels: + app: messaging-bridges + name: amqp-to-zmq + spec: + replicas: {{ (env == 'production') | ternary(1, 0) }} + selector: + deploymentconfig: amqp-to-zmq + strategy: + resources: {} + template: + metadata: + labels: + app: messaging-bridges + deploymentconfig: amqp-to-zmq + spec: + containers: + - name: fedmsg-migration-tools + image: fedmsg-migration-tools:latest + env: + - name: APP_SCRIPT + value: "./.s2i/amqp-to-zmq" + - name: FEDORA_MESSAGING_CONF + value: "/etc/fedora-messaging/amqp-to-zmq.toml" + volumeMounts: + - name: config-volume + mountPath: /etc/fedora-messaging/ + readOnly: true + - 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 + - name: rabbitmq-ca-volume + mountPath: /etc/pki/rabbitmq/ca + readOnly: true + - name: rabbitmq-key-volume + mountPath: /etc/pki/rabbitmq/key + readOnly: true + - name: rabbitmq-crt-volume + mountPath: /etc/pki/rabbitmq/crt + readOnly: true + volumes: + - name: config-volume + configMap: + name: fedora-messaging-configmap + - name: fedmsg-config-volume + configMap: + name: fedmsg-configmap + - name: fedmsg-key-volume + secret: + secretName: fedmsg-key + - name: fedmsg-crt-volume + secret: + secretName: fedmsg-cert + - name: rabbitmq-ca-volume + secret: + secretName: rabbitmq-ca + - name: rabbitmq-key-volume + secret: + secretName: rabbitmq-key + - name: rabbitmq-crt-volume + secret: + secretName: rabbitmq-cert + + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - fedmsg-migration-tools + from: + kind: ImageStreamTag + name: fedmsg-migration-tools:latest +--- +apiVersion: apps.openshift.io/v1 +kind: List +metadata: {} +items: +- apiVersion: apps.openshift.io/v1 + kind: DeploymentConfig + metadata: + labels: + app: messaging-bridges + name: zmq-to-amqp + spec: + replicas: {{ (env == 'production') | ternary(1, 0) }} + selector: + deploymentconfig: zmq-to-amqp + strategy: + resources: {} + template: + metadata: + labels: + app: messaging-bridges + deploymentconfig: zmq-to-amqp + spec: + containers: + - name: fedmsg-migration-tools + image: fedmsg-migration-tools:latest + env: + - name: APP_SCRIPT + value: "./.s2i/zmq-to-amqp" + - name: FEDMSG_MIGRATION_TOOLS_CONF + value: "/etc/fedora-messaging/zmq-to-amqp.toml" + volumeMounts: + - name: config-volume + mountPath: /etc/fedora-messaging/ + readOnly: true + - name: fedmsg-config-volume + mountPath: /etc/fedmsg.d/ + readOnly: true + - name: rabbitmq-ca-volume + mountPath: /etc/pki/rabbitmq/ca + readOnly: true + - name: rabbitmq-key-volume + mountPath: /etc/pki/rabbitmq/key + readOnly: true + - name: rabbitmq-crt-volume + mountPath: /etc/pki/rabbitmq/crt + readOnly: true + volumes: + - name: config-volume + configMap: + name: fedora-messaging-configmap + - name: fedmsg-config-volume + configMap: + name: fedmsg-configmap + - name: rabbitmq-ca-volume + secret: + secretName: rabbitmq-ca + - name: rabbitmq-key-volume + secret: + secretName: rabbitmq-key + - name: rabbitmq-crt-volume + secret: + secretName: rabbitmq-cert + + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - fedmsg-migration-tools + from: + kind: ImageStreamTag + name: fedmsg-migration-tools:latest +--- +apiVersion: apps.openshift.io/v1 +kind: List +metadata: {} +items: +- apiVersion: apps.openshift.io/v1 + kind: DeploymentConfig + metadata: + labels: + app: messaging-bridges + name: verify-missing + spec: + replicas: {{ (env == 'production') | ternary(1, 0) }} + selector: + deploymentconfig: verify-missing + strategy: + resources: {} + template: + metadata: + labels: + app: messaging-bridges + deploymentconfig: verify-missing + spec: + containers: + - name: fedmsg-migration-tools + image: fedmsg-migration-tools:latest + env: + - name: APP_SCRIPT + value: "./.s2i/verify-missing" + - name: FEDMSG_MIGRATION_TOOLS_CONF + value: "/etc/fedora-messaging/verify-missing.toml" + volumeMounts: + - name: config-volume + mountPath: /etc/fedora-messaging/ + readOnly: true + - name: fedmsg-config-volume + mountPath: /etc/fedmsg.d/ + readOnly: true + - name: rabbitmq-ca-volume + mountPath: /etc/pki/rabbitmq/ca + readOnly: true + - name: rabbitmq-key-volume + mountPath: /etc/pki/rabbitmq/key + readOnly: true + - name: rabbitmq-crt-volume + mountPath: /etc/pki/rabbitmq/crt + readOnly: true + volumes: + - name: config-volume + configMap: + name: fedora-messaging-configmap + - name: fedmsg-config-volume + configMap: + name: fedmsg-configmap + - name: rabbitmq-ca-volume + secret: + secretName: rabbitmq-ca + - name: rabbitmq-key-volume + secret: + secretName: rabbitmq-key + - name: rabbitmq-crt-volume + secret: + secretName: rabbitmq-cert + + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - fedmsg-migration-tools + from: + kind: ImageStreamTag + name: fedmsg-migration-tools:latest