Use new RDS DB in CF manifest

We remove the old postgres job, point to the RDS DB by reading terraform outputs, use the password variables we renamed earlier.
alphagov · Feb 29, 2016 · fa735c2 · fa735c2
1 parent 3bd6785
commit fa735c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/manifests/cf-manifest/deployments/030-cf-jobs.yml b/manifests/cf-manifest/deployments/030-cf-jobs.yml
@@ -340,7 +340,7 @@ jobs:
 
   - name: postgres_z1
     templates: (( grab meta.postgres_templates ))
-    instances: 1
+    instances: 0
     resource_pool: medium_z1
     persistent_disk: 4096
     networks:
@@ -844,26 +844,6 @@ properties:
 
   ha_proxy:
 
-  databases:
-     db_scheme: postgres
-     address: ~
-     port: 5524
-     roles:
-       - tag: admin
-         name: ccadmin
-         password: (( grab secrets.ccadmin_password ))
-       - tag: admin
-         name: uaaadmin
-         password: (( grab secrets.uuadmin_password ))
-     databases:
-       - tag: cc
-         name: ccdb
-         citext: true
-       - tag: uaa
-         name: uaadb
-         citext: true
-
-
   router:
     enable_ssl: true
     ssl_cert: (( grab secrets.router_ssl_cert ))

diff --git a/manifests/cf-manifest/deployments/aws/999-cf-stub.yml b/manifests/cf-manifest/deployments/aws/999-cf-stub.yml
@@ -216,31 +216,29 @@ properties:
 
   ccdb:
     db_scheme: postgres
-    address: (( grab jobs.postgres_z1.networks.cf1.static_ips.[0] ))
-    port: 5524
+    address: (( grab terraform_outputs.cf_db_address ))
+    port: 5432
     roles:
       - tag: admin
-        name: ccadmin
-        password: (( grab secrets.ccadmin_password ))
+        name: api
+        password: (( grab secrets.cf_db_api_password ))
     databases:
       - tag: cc
-        name: ccdb
+        name: api
         citext: true
 
   uaadb:
     db_scheme: postgresql
-    address: (( grab jobs.postgres_z1.networks.cf1.static_ips.[0] ))
-    port: 5524
+    address: (( grab terraform_outputs.cf_db_address ))
+    port: 5432
     roles:
       - tag: admin
-        name: uaaadmin
-        password: (( grab secrets.uuadmin_password ))
+        name: uaa
+        password: (( grab secrets.cf_db_uaa_password ))
     databases:
       - tag: uaa
-        name: uaadb
+        name: uaa
         citext: true
 
-  databases:
-    address: (( grab jobs.postgres_z1.networks.cf1.static_ips.[0] ))
 # code_snippet cf-stub-aws end
 # The previous line helps maintain current documentation at http://docs.cloudfoundry.org.