8000 dev: move postgres to salt-master · python/psf-salt@1700306 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1700306

Browse files
ewdurbinewdurbin
committed
dev: move postgres to salt-master
we no longer run our own pg infra, so don't act like it. the pg install on salt-master could be dramatically streamlined... but for now just use the remnant
1 parent 9277e8d commit 1700306

File tree

4 files changed

+7
-18
lines changed

4 files changed

+7
-18
lines changed

‎Vagrantfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ SERVERS = [
1515
"mail",
1616
"moin",
1717
"planet",
18-
"postgresql-primary",
1918
"pypy-web",
2019
"pythontest",
2120
"web-pypa",

‎pillar/dev/postgres/clusters.sls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
postgresql-clusters:
22
pg-vagrant-psf-io:
3-
host: postgresql-primary.vagrant.psf.io
3+
host: salt-master.vagrant.psf.io
44
port: 5432
5-
sslmode: verify-ca
5+
sslmode: verify-full
66
ca_cert_pillar: 'tls:ca:PSF_CA'

‎pillar/dev/roles.sls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ roles:
5555
purpose: ""
5656
contact: ""
5757
postgresql:
58-
pattern: "postgresql-*.vagrant.psf.io"
58+
pattern: "salt-master.vagrant.psf.io"
5959
purpose: ""
6060
contact: ""
6161
postgresql-primary:
62-
pattern: "postgresql-primary.vagrant.psf.io"
62+
pattern: "salt-master.vagrant.psf.io"
6363
purpose: ""
6464
contact: ""
6565
postgresql-replica:

‎pillar/dev/top.sls

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,16 @@ base:
6767
- planet
6868
- firewall.http
6969

70-
'postgresql':
70+
'salt-master':
7171
- match: nodegroup
72+
- firewall.salt
73+
- pebble
7274
- firewall.postgresql
7375
- postgresql.server
7476
- postgres.databases
75-
76-
'postgresql-primary':
77-
- match: nodegroup
7877
- secrets.postgresql-admin
7978
- secrets.postgresql-users.all
8079

81-
'postgresql-replica':
82-
- match: nodegroup
83-
- secrets.postgresql-users.replica
84-
85-
'salt-master':
86-
- match: nodegroup
87-
- firewall.salt
88-
- pebble
89-
9080
'tracker':
9181
- match: nodegroup
9282
- secrets.postgresql-users.tracker

0 commit comments

Comments
 (0)
0