diff --git a/PORTS b/PORTS --- a/PORTS +++ b/PORTS @@ -19,7 +19,6 @@ 28080 phragile HTTP 29080 etcd HTTP 32080 Discourse HTTP - 33080 Bugzilla HTTP - Espace Win 40080 RocketChat HTTP paas-docker @@ -31,6 +30,7 @@ 24180 Tommy HTTP - CD 25080 Auth Grove HTTP 31080 Phabricator HTTP - DevCentral + 33080 Bugzilla HTTP - Espace Win 34080 Etherpad 38080 Jenkins HTTP - CD 39080 Cachet HTTP diff --git a/pillar/credentials/zr.sls b/pillar/credentials/zr.sls --- a/pillar/credentials/zr.sls +++ b/pillar/credentials/zr.sls @@ -27,3 +27,13 @@ etherpad: # This API key is used by Wolfplex API to access to the pad lists api: 125 + + # + # Credentials used by Espace Win services + # + + espacewin: + + # bugzilla.espace-win.org + bugzilla: + mysql: 131 diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls --- a/pillar/paas/docker.sls +++ b/pillar/paas/docker.sls @@ -126,6 +126,20 @@ network: bugzilla version: 5.7 + # + # Bugzilla + # + + bugzilla: + ew_bugzilla: + host: bugzilla.espace-win.org + app_port: 33080 + network: bugzilla + mysql: + host: bugzilla_db + db: EspaceWin_Bugs + credential: espacewin.bugzilla.mysql + # # Equatower is the current production engine # diff --git a/pillar/top.sls b/pillar/top.sls --- a/pillar/top.sls +++ b/pillar/top.sls @@ -17,6 +17,7 @@ - webserver.sites dwellers: + - credentials.zr - paas.docker eglide: diff --git a/roles/paas-docker/containers/bugzilla.sls b/roles/paas-docker/containers/bugzilla.sls new file mode 100644 --- /dev/null +++ b/roles/paas-docker/containers/bugzilla.sls @@ -0,0 +1,35 @@ +# ------------------------------------------------------------- +# Salt — Provision Docker engine +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Nasqueron +# Created: 2018-10-07 +# License: Trivial work, not eligible to copyright +# ------------------------------------------------------------- + +{% set containers = pillar['docker_containers'][grains['id']] %} + +{% for instance, container in containers['bugzilla'].items() %} + +# ------------------------------------------------------------- +# Container +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +{{ instance }}: + docker_container.running: + - detach: True + - interactive: True + - image: nasqueron/bugzilla + - networks: + - {{ container['network']}} + - environment: + DB_HOST: {{ container['mysql']['host']}} + DB_DATABASE: {{ container['mysql']['db']}} + DB_USER: {{ salt['zr.get_username'](container['credential']) }} + DB_PASSWORD: {{ salt['zr.get_password'](container['credential']) }} + BUGZILLA_URL: https://{{ container['host'] }} + - ports: + - 80 + - port_bindings: + - {{ container['app_port'] }}:80 + +{% endfor %}