Use configured port everywhere we talk to postgres

ChangeLog-Entry: Use configured port everywhere we talk to postgres
chef · Sep 24, 2015 · 7dec949 · 7dec949
1 parent e3fa72d
commit 7dec949
Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/omnibus/files/private-chef-cookbooks/private-chef/templates/default/bootstrap-config.rb.erb b/omnibus/files/private-chef-cookbooks/private-chef/templates/default/bootstrap-config.rb.erb
@@ -2,6 +2,7 @@ output_directory: '/tmp/opscode-platform-test'
 
 db_driver: "postgres"
 db_host: '<%= node['private_chef']['postgresql']['vip'] %>'
+db_port: '<%= node['private_chef']['postgresql']['port'] %>'
 db_user: '<%= node['private_chef']['opscode-erchef']['sql_user'] %>'
 db_password: '<%= node['private_chef']['opscode-erchef']['sql_password'] %>'
 

diff --git a/omnibus/files/private-chef-cookbooks/private-chef/templates/default/oc_erchef.config.erb b/omnibus/files/private-chef-cookbooks/private-chef/templates/default/oc_erchef.config.erb
@@ -197,7 +197,7 @@
            {ip_mode, [ <%=PrivateChef['use_ipv6'] ? "ipv6,ipv4" : "ipv4" %> ] },
            %% Database connection parameters
            {db_host, "<%= node['private_chef']['postgresql']['vip'] %>"},
-           {db_port, 5432},
+           {db_port, <%= node['private_chef']['opscode-erchef']['sql_user'] %>},
            {db_user, "<%= node['private_chef']['opscode-erchef']['sql_user'] %>"},
            {db_pass, "<%= node['private_chef']['opscode-erchef']['sql_password'] %>"},
            {db_name, "opscode_chef" },

diff --git a/src/chef-server-bootstrap/bin/bootstrap-platform b/src/chef-server-bootstrap/bin/bootstrap-platform
@@ -38,7 +38,7 @@ class BootstrapPlatform
   def bootstrap
     config = YAML.load_file(@config_file)
 
-    db = Sequel.connect("#{config['db_driver']}://#{config['db_user']}:#{config['db_password']}@#{config['db_host']}/opscode_chef")
+    db = Sequel.connect("#{config['db_driver']}://#{config['db_user']}:#{config['db_password']}@#{config['db_host']}:#{config['db_port']}/opscode_chef")
 
     #################################
     # create superuser authz object #