Page MenuHomeDevCentral
Files F3765213

D2900.diff
No OneTemporary
Actions

D2900.diff
View Options

diff --git a/pillar/paas/docker/dwellers/sentry.sls b/pillar/paas/docker/dwellers/sentry.sls
new file mode 100644
--- /dev/null
+++ b/pillar/paas/docker/dwellers/sentry.sls
@@ -0,0 +1,16 @@
+# -------------------------------------------------------------
+# Salt — Provision Docker engine
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Service: Sentry
+# -------------------------------------------------------------
+
+docker_images:
+ - getsentry/relay:nightly
+
+docker_containers:
+ relay:
+ sentry_relay:
+ app_port: 26300
+ flavour: dev
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -36,7 +36,6 @@
dwellers:
- paas.docker
- saas.jenkins
- - saas.sentry
eglide:
- shellserver.quassel
diff --git a/roles/paas-docker/containers/files/relay/dev.yml b/roles/paas-docker/containers/files/relay/dev.yml
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/containers/files/relay/dev.yml
@@ -0,0 +1,25 @@
+# -------------------------------------------------------------
+# Sentry configuration - Relay
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/paas-docker/containers/files/relay/dev.yml
+# Description: Relay instance capturing messages for Sentry SDK
+# development, and high logging level
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+relay:
+ mode: capture
+
+ host: 0.0.0.0
+ port: 3000
+
+logging:
+ level: trace
diff --git a/roles/paas-docker/containers/relay.sls b/roles/paas-docker/containers/relay.sls
--- a/roles/paas-docker/containers/relay.sls
+++ b/roles/paas-docker/containers/relay.sls
@@ -8,6 +8,7 @@
{% set has_selinux = salt['grains.get']('selinux:enabled', False) %}
{% for instance, container in pillar['docker_containers']['relay'].items() %}
+{% set flavour = container.get("flavour", "production") %}
# -------------------------------------------------------------
# Data directory
@@ -19,7 +20,11 @@
/srv/relay/{{ instance }}/config.yml:
file.managed:
+ {% if flavour == "production" %}
- source: salt://roles/paas-docker/containers/files/relay/config.yml.jinja
+ {% else %}
+ - source: salt://roles/paas-docker/containers/files/relay/dev.yml
+ {% endif %}
- mode: 644
- template: jinja
- context:
@@ -28,7 +33,7 @@
relay_{{ instance }}_credentials:
docker_container.run:
- image: getsentry/relay:nightly
- - command: bash -c "relay credentials generate --stdout > /work/.relay/credentials.json"
+ - command: bash -c "relay credentials generate --stdout > /tmp/credentials.json && mv /tmp/credentials.json /work/.relay/"
- binds:
- /srv/relay/{{ instance }}:/work/.relay
- replace: True
@@ -56,12 +61,16 @@
- image: getsentry/relay:nightly
- binds:
- /srv/relay/{{ instance }}:/work/.relay
+{% if flavour == "production" %}
- /srv/geoip:/usr/local/share/geoip:ro
+{% endif %}
- ports:
- 3000
- port_bindings:
- {{ container['app_port'] }}:3000
+{% if "network" in container %}
- networks:
- {{ container['network'] }}
+{% endif %}
{% endfor %}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 11:04 (18 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2257825
Default Alt Text
D2900.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator