diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index f2a8be8eb6..19ce2b2668 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 361a40f946..6a6196f770 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 a5a0236006..98743f5524 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 39b0c2dd72..c347d24688 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/templates/deploymentconfig.yml similarity index 97% rename from roles/openshift-apps/messaging-bridges/files/deploymentconfig.yml rename to roles/openshift-apps/messaging-bridges/templates/deploymentconfig.yml index 3fb85c6878..98e29c4d27 100644 --- a/roles/openshift-apps/messaging-bridges/files/deploymentconfig.yml +++ b/roles/openshift-apps/messaging-bridges/templates/deploymentconfig.yml @@ -10,7 +10,7 @@ items: app: messaging-bridges name: amqp-to-zmq spec: - replicas: 1 + replicas: {{ (env == 'production') | ternary(1, 0) }} selector: deploymentconfig: amqp-to-zmq strategy: @@ -96,7 +96,7 @@ items: app: messaging-bridges name: zmq-to-amqp spec: - replicas: 1 + replicas: {{ (env == 'production') | ternary(1, 0) }} selector: deploymentconfig: zmq-to-amqp strategy: @@ -170,7 +170,7 @@ items: app: messaging-bridges name: verify-missing spec: - replicas: 1 + replicas: {{ (env == 'production') | ternary(1, 0) }} selector: deploymentconfig: verify-missing strategy: