External database fixes & improvements

- bbsdb uses diegodb_* params (backwards compatibility
- default usernames for all databases that match the database name (if a
  universal `params.external_db_username` not provided)
- fix *_port bosh-variables (was pointing to the corresponding host
  param instead of the port param)

overlay/db/external.yml

@@ -2,42 +2,42 @@
 params:
   uaadb_host:       (( grab params.external_db_host ))
   uaadb_port:       (( grab params.external_db_port ))
-  uaadb_user:       (( grab params.external_db_username ))
+  uaadb_user:       (( grab params.external_db_username "uaa" ))
   uaadb_password:   (( grab params.external_db_password ))
 
   ccdb_host:        (( grab params.external_db_host ))
   ccdb_port:        (( grab params.external_db_port ))
-  ccdb_user:        (( grab params.external_db_username ))
+  ccdb_user:        (( grab params.external_db_username || "cloud_controller" ))
   ccdb_password:    (( grab params.external_db_password ))
 
   diegodb_host:     (( grab params.external_db_host ))
   diegodb_port:     (( grab params.external_db_port ))
-  diegodb_user:     (( grab params.external_db_username ))
+  diegodb_user:     (( grab params.external_db_username || "diego" ))
   diegodb_password: (( grab params.external_db_password ))
 
   policyserverdb_host:     (( grab params.external_db_host ))
   policyserverdb_port:     (( grab params.external_db_port ))
-  policyserverdb_user:     (( grab params.external_db_username ))
+  policyserverdb_user:     (( grab params.external_db_username || "network_policy" ))
   policyserverdb_password: (( grab params.external_db_password ))
 
   silkdb_host:     (( grab params.external_db_host ))
   silkdb_port:     (( grab params.external_db_port ))
-  silkdb_user:     (( grab params.external_db_username ))
+  silkdb_user:     (( grab params.external_db_username || "network_connectivity" ))
   silkdb_password: (( grab params.external_db_password ))
 
   locketdb_host:     (( grab params.external_db_host ))
   locketdb_port:     (( grab params.external_db_port ))
-  locketdb_user:     (( grab params.external_db_username ))
+  locketdb_user:     (( grab params.external_db_username || "locket" ))
   locketdb_password: (( grab params.external_db_password ))
 
   routingapidb_host:     (( grab params.external_db_host ))
   routingapidb_port:     (( grab params.external_db_port ))
-  routingapidb_user:     (( grab params.external_db_username ))
+  routingapidb_user:     (( grab params.external_db_username || "routing_api" ))
   routingapidb_password: (( grab params.external_db_password ))
 
   credhubdb_host:     (( grab params.external_db_host ))
   credhubdb_port:     (( grab params.external_db_port ))
-  credhubdb_user:     (( grab params.external_db_username ))
+  credhubdb_user:     (( grab params.external_db_username || "credhub" ))
   credhubdb_password: (( grab params.external_db_password ))
 
 bosh-variables:
@@ -46,49 +46,49 @@ bosh-variables:
 
   external_uaa_database_name:     (( grab params.uaadb_name || "uaa" ))
   external_uaa_database_address:  (( grab params.uaadb_host ))
-  external_uaa_database_port:     (( grab params.uaadb_host ))
+  external_uaa_database_port:     (( grab params.uaadb_port ))
   external_uaa_database_username: (( grab params.uaadb_user ))
   external_uaa_database_password: (( grab params.uaadb_password ))
 
   external_cc_database_name:     (( grab params.ccdb_name || "cloud_controller" ))
   external_cc_database_address:  (( grab params.ccdb_host ))
-  external_cc_database_port:     (( grab params.ccdb_host ))
+  external_cc_database_port:     (( grab params.ccdb_port ))
   external_cc_database_username: (( grab params.ccdb_user ))
   external_cc_database_password: (( grab params.ccdb_password ))
 
-  external_bbs_database_name:     (( grab params.bbsdb_name || "diego"))
-  external_bbs_database_address:  (( grab params.bbsdb_host ))
-  external_bbs_database_port:     (( grab params.bbsdb_host ))
-  external_bbs_database_username: (( grab params.bbsdb_user ))
-  external_bbs_database_password: (( grab params.bbsdb_password ))
+  external_bbs_database_name:     (( grab params.diegodb_name || "diego"))
+  external_bbs_database_address:  (( grab params.diegodb_host ))
+  external_bbs_database_port:     (( grab params.diegodb_port ))
+  external_bbs_database_username: (( grab params.diegodb_user ))
+  external_bbs_database_password: (( grab params.diegodb_password ))
 
   external_policy_server_database_name:     (( grab params.policyserverdb_name || "network_policy"))
   external_policy_server_database_address:  (( grab params.policyserverdb_host ))
-  external_policy_server_database_port:     (( grab params.policyserverdb_host ))
+  external_policy_server_database_port:     (( grab params.policyserverdb_port ))
   external_policy_server_database_password: (( grab params.policyserverdb_password ))
   external_policy_server_database_username: (( grab params.policyserverdb_user ))
 
   external_silk_controller_database_name:     (( grab params.silkdb_name || "network_connectivity"))
   external_silk_controller_database_address:  (( grab params.silkdb_host ))
-  external_silk_controller_database_port:     (( grab params.silkdb_host ))
+  external_silk_controller_database_port:     (( grab params.silkdb_port ))
   external_silk_controller_database_password: (( grab params.silkdb_password ))
   external_silk_controller_database_username: (( grab params.silkdb_user ))
 
-  external_routing_api_database_name:     (( grab params.routingapidb_name || "routing-api"))
+  external_routing_api_database_name:     (( grab params.routingapidb_name || "routing_api"))
   external_routing_api_database_address:  (( grab params.routingapidb_host ))
-  external_routing_api_database_port:     (( grab params.routingapidb_host ))
+  external_routing_api_database_port:     (( grab params.routingapidb_port ))
   external_routing_api_database_username: (( grab params.routingapidb_user ))
   external_routing_api_database_password: (( grab params.routingapidb_password ))
 
   external_locket_database_name:     (( grab params.locketdb_name || "locket"))
   external_locket_database_address:  (( grab params.locketdb_host ))
-  external_locket_database_port:     (( grab params.locketdb_host ))
+  external_locket_database_port:     (( grab params.locketdb_port ))
   external_locket_database_password: (( grab params.locketdb_password ))
   external_locket_database_username: (( grab params.locketdb_user ))
 
   external_credhub_database_name:     (( grab params.credhubdb_name || "credhub"))
   external_credhub_database_address:  (( grab params.credhubdb_host ))
-  external_credhub_database_port:     (( grab params.credhubdb_host ))
+  external_credhub_database_port:     (( grab params.credhubdb_port ))
   external_credhub_database_password: (( grab params.credhubdb_password ))
   external_credhub_database_username: (( grab params.credhubdb_user ))