Page MenuHomeDevCentral
Files F3608284

D2788.id7078.diff
No OneTemporary
Actions

D2788.id7078.diff
View Options

diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
--- a/pillar/credentials/vault.sls
+++ b/pillar/credentials/vault.sls
@@ -129,7 +129,7 @@
# Format: <project name>.<service>.<type>
#
- - ops/secrets/espacewin.bugzilla.mysql
+ - ops/secrets/espacewin.phpbb.mysql_root
- ops/secrets/wolfplex.phabricator.mailgun
- ops/secrets/wolfplex.phabricator.mysql
@@ -137,6 +137,16 @@
- ops/secrets/zed.phabricator.mysql
- ops/secrets/zed.phabricator.sendgrid
+ paas-docker-dev:
+
+ #
+ # Credentials used by projects hosted by Nasqueron
+ # Format: <project name>.<service>.<type>
+ #
+
+ - ops/secrets/espacewin.bugzilla.mysql
+ - ops/secrets/espacewin.bugzilla.mysql_root
+
viperserv:
- ops/secrets/nasqueron.viperserv.vault
diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -151,6 +151,8 @@
bugzilla_db:
network: bugzilla
version: 5.7
+ credentials:
+ root: espacewin.bugzilla.mysql_root
#
# Bugzilla
@@ -204,8 +206,12 @@
#
mysql:
- acquisitariat: {}
- phpbb_db: {}
+ acquisitariat:
+ credentials:
+ root: nasqueron.acquisitariat.mysql
+ phpbb_db:
+ credentials:
+ root: espacewin.phpbb.mysql_root
postgresql:
sentry_db:
diff --git a/roles/paas-docker/containers/mysql.sls b/roles/paas-docker/containers/mysql.sls
--- a/roles/paas-docker/containers/mysql.sls
+++ b/roles/paas-docker/containers/mysql.sls
@@ -44,7 +44,7 @@
- image: {{ image }}
- binds: /srv/{{ instance }}/mysql:/var/lib/mysql
- environment:
- MYSQL_ROOT_PASSWORD: {{ salt['zr.generate_random'](31) }}
+ MYSQL_ROOT_PASSWORD: {{ salt['credentials.get_password'](container['credentials']['root']) }}
{% if 'network' in container %}
- networks:
- {{ container['network'] }}

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 14:22 (21 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2168007
Default Alt Text
D2788.id7078.diff (1 KB)

Event Timeline

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