lib/chef_fixie/config.rb in chef_fixie-0.2.1 vs lib/chef_fixie/config.rb in chef_fixie-0.3.0
- old
+ new
@@ -110,12 +110,13 @@
@authz_uri = "http://#{authz_vip}:#{authz_port}"
@superuser_id = authz_config['superuser_id']
sql_config = config['private_chef']['postgresql']
+ erchef_config = config['private_chef']['opscode-erchef']
- sql_user = sql_config['sql_user']
- sql_pw = sql_config['sql_password']
+ sql_user = sql_config['sql_user'] || erchef_config['sql_user']
+ sql_pw = sql_config['sql_password'] || erchef_config['sql_password']
sql_vip = sql_config['vip']
sql_port = sql_config['port']
@sql_database = "postgres://#{sql_user}:#{sql_pw}@#{sql_vip}/opscode_chef"