Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F24665089
D3991.id10350.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D3991.id10350.diff
View Options
diff --git a/pillar/mailserver/dovecot.sls b/pillar/mailserver/dovecot.sls
--- a/pillar/mailserver/dovecot.sls
+++ b/pillar/mailserver/dovecot.sls
@@ -7,6 +7,6 @@
dovecot_config:
db:
- service: db-A
+ service: db-a
database: mail
credential: dbserver/cluster-A/users/dovecot
diff --git a/pillar/mailserver/postfix.sls b/pillar/mailserver/postfix.sls
--- a/pillar/mailserver/postfix.sls
+++ b/pillar/mailserver/postfix.sls
@@ -7,6 +7,6 @@
postfix_config:
db:
- service: db-A
+ service: db-a
database: mail
credential: dbserver/cluster-A/users/postfix
diff --git a/pillar/mailserver/vimbadmin.sls b/pillar/mailserver/vimbadmin.sls
--- a/pillar/mailserver/vimbadmin.sls
+++ b/pillar/mailserver/vimbadmin.sls
@@ -7,7 +7,7 @@
vimbadmin_config:
db:
- service: db-A
+ service: db-a
database: mail
credential: dbserver/cluster-A/users/mailManagement
security: mailserver/security
diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -58,9 +58,9 @@
netmask: *intranought_netmask
gateway: 172.27.27.1
- db-A-001:
+ db-a-001:
forest: nasqueron-infra
- hostname: db-A-001.nasqueron.drake
+ hostname: db-a-001.nasqueron.drake
roles:
- dbserver-pgsql
zfs:
diff --git a/pillar/paas/alkane/windriver/obsidian.sls b/pillar/paas/alkane/windriver/obsidian.sls
--- a/pillar/paas/alkane/windriver/obsidian.sls
+++ b/pillar/paas/alkane/windriver/obsidian.sls
@@ -37,7 +37,7 @@
databases:
- service: db-B
credentials: dbserver/cluster-B/users/obsidian51
- - service: db-A
+ - service: db-a
credentials: dbserver/cluster-A/users/obsidian
prefix: ORBEON_
extra_values:
diff --git a/pillar/paas/docker/dwellers/airflow.sls b/pillar/paas/docker/dwellers/airflow.sls
--- a/pillar/paas/docker/dwellers/airflow.sls
+++ b/pillar/paas/docker/dwellers/airflow.sls
@@ -52,7 +52,7 @@
network: airflow
services:
redis: airflow_redis
- postgresql: 172.27.27.8 # db-A-001.nasqueron.drake
+ postgresql: 172.27.27.8 # db-a-001.nasqueron.drake
credentials:
admin_account: nasqueron/airflow/admin_account
fernet_key: nasqueron/airflow/fernet
diff --git a/pillar/paas/docker/dwellers/orbeon.sls b/pillar/paas/docker/dwellers/orbeon.sls
--- a/pillar/paas/docker/dwellers/orbeon.sls
+++ b/pillar/paas/docker/dwellers/orbeon.sls
@@ -26,7 +26,7 @@
app_port: 16080
network: orbeon
db:
- service: db-A
+ service: db-a
database: forms
credential: dbserver/cluster-A/users/orbeon
secret_key: nasqueron/orbeon/oxf.crypto.password
diff --git a/pillar/services/table.sls b/pillar/services/table.sls
--- a/pillar/services/table.sls
+++ b/pillar/services/table.sls
@@ -30,7 +30,7 @@
- 172.27.27.35 # windriver
# Databases
- db-A: 172.27.27.8
+ db-a: 172.27.27.8
db-B: 172.27.27.9
# Mail
@@ -59,7 +59,7 @@
- 172.27.27.4 # dwellers
- 172.27.27.5 # docker-002
- 172.27.27.7 # complector
- - 172.27.27.8 # db-A-001
+ - 172.27.27.8 # db-a-001
- 172.27.27.9 # db-B-001
- 172.27.27.10 # web-001
- 172.27.27.35 # windriver
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -36,7 +36,7 @@
- saas.jenkins
- saas.phpbb
- db-A-001:
+ db-a-001:
- dbserver.cluster-A
db-B-001:
diff --git a/roles/core/motd/files/db-A-001 b/roles/core/motd/files/db-A-001
--- a/roles/core/motd/files/db-A-001
+++ b/roles/core/motd/files/db-A-001
@@ -1,5 +1,5 @@
____ ______ ___
- / )/ \/ \ db-A-001.nasqueron.drake
+ / )/ \/ \ db-a-001.nasqueron.drake
( / __ _\ )
\ (/ o) ( o) ) IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
\_ (_ ) \ ) / GW: {{ ipv4_gateway.ljust(16) }} Cluster A | PostgreSQL
diff --git a/top.sls b/top.sls
--- a/top.sls
+++ b/top.sls
@@ -37,7 +37,7 @@
- roles/webserver-core
'cloudhugger':
- roles/opensearch
- 'db-A-001':
+ 'db-a-001':
- roles/dbserver-pgsql
'db-B-001':
- roles/dbserver-mysql
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Mar 5, 02:06 (12 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3496278
Default Alt Text
D3991.id10350.diff (4 KB)
Attached To
Mode
D3991: Change db-A-001 to db-a-001 and db-B-001 to db-b-001 on all files
Attached
Detach File
Event Timeline
Log In to Comment