Permalink
Browse files

Include missing dependencies in mover build

I think we're including too many dependencies now, which is better than
not enough, but armed with a good test environment, we should be able to
pull out the dependencies we don't actually need.
  • Loading branch information...
joedevivo committed Jul 6, 2015
1 parent 0ac414d commit 39298c1e640140e0ca71d94a60896bca4ab1126d
@@ -22,8 +22,8 @@
replace "private-chef"
conflict "private-chef"
install_dir "/opt/opscode"
# last released version is 12.0.8
build_version "12.1.0"
# last released version is 12.1.0
build_version "12.1.1"
build_iteration 1
override :cacerts, version: '2014.08.20'
@@ -2,6 +2,7 @@
%% ex: ts=4 sw=4 ft=erlang et
[
{kernel, [{start_pg2, true}]},
%% SASL config
{sasl, [
{sasl_error_logger, {file, "log/sasl-error.log"}},
@@ -10,89 +11,147 @@
{error_logger_mf_maxbytes, 10485760}, % 10 MB max file size
{error_logger_mf_maxfiles, 5} % 5 files max
]},
%% Lager Config
{lager, [
%% https://github.com/basho/lager/blob/master/README.org
{handlers, [
{lager_console_backend,
[error,
{lager_default_formatter,
[time, " [", severity, "] ",
{error_type, [error_type, " "], ""},
{org_name, [org_name, " (", org_id, "): "], ""}, message, "\n"]}]},
{fast_log, [
{loggers, [[{name, mover_manager_log},
{file, "log/mover_manager.log"},
{files, 5},
{file_size, 50}],
[{name, mover_worker_log},
{file, "log/mover_worker.log"},
{files, 5},
{file_size, 50}],
[{name, node_errors},
{file, "log/node_errors.log"},
{files, 5},
{file_size, 50}]
]}
]},
{mover, [
{redis_host, "{{redis_host}}" },
{redis_port, {{redis_port}} },
{redis_db, {{redis_db}} },
{redis_conns, {{redis_conns}} },
{lager_file_backend, [
[{"log/error.log", error, 10485760, "$D0", 5},
{lager_default_formatter,
[date, " ", time, " [", severity, "] ",
{org_name, [org_name, " (", org_id, "): "], "no_org (no_id):"},
{error_type, [error_type, " "], ""},
message, "\n"]}],
{dry_run, {{dry_run}} },
{preload_org_count, {{preload_org_count}} },
{nginx_control_urls, ["http://nginx_host1/a",
"http://nginx_host2/a"]},
{darklaunch_urls, ["http://darklaunch1",
"http://darklaunch2"] }
[{"log/console.log", info, 10485760, "$D0", 5},
{lager_default_formatter,
[date, " ", time, " [", severity, "] ",
{org_name, [org_name, " (", org_id, "): "], "no_org (no_id):"},
{error_type, [error_type, " "], ""},
message, "\n"]}]
]}
]},
{crash_log, "log/crash.log"},
{crash_log_msg_size, 65536},
{crash_log_size, 10485760},
{crash_log_date, "$D0"},
{crash_log_count, 5},
{error_logger_redirect, true},
{error_logger_hwm, 1000 }
]},
{oc_chef_authz, [
{authz_service, [{root_url, "http://localhost/dontcare"},
{timeout, 0},
{init_count, 25},
{max_count, 50},
{cull_interval, {1,min}},
{max_age, {70, sec}},
{max_connection_duration, {70,sec}},
{ibrowse_options, [{connect_timeout, 5000}]}]},
{stats_hero, [
{udp_socket_pool_size, {{udp_socket_pool_size}} },
{estatsd_host, "{{estatsd_server}}" },
{estatsd_port, {{estatsd_port}} }
]},
{authz_superuser_id, <<"12345">>},
{authz_root_url, "http://localhost/dontcare" }
]},
{chef_db, [
{bulk_fetch_batch_size, 5},
{cache_defaults, [{max_size, 10000 },
{ttl, 3600 }]},
{couchdb_host, {{couchdb_server}} },
{couchdb_port, {{couchdb_port}} }
]},
{chef_common, [
{solr_url, "{{solr_url}}" },
{couchdb_host, "{{couchdb_server}}"},
{couchdb_port, {{couchdb_port}} },
{dark_launch_sql_users, {{sql_users}} },
{cache_defaults, [{max_size, {{max_cache_size}} },
{ttl, {{cache_ttl}} }]},
{rabbitmq_host, "{{rabbitmq_host}}"},
{chef_index, [
{rabbitmq_host, "{{rabbitmq_host}}" },
{rabbitmq_port, {{rabbitmq_port}} },
{rabbitmq_user, <<"{{rabbitmq_user}}">>},
{rabbitmq_password, <<"{{rabbitmq_password}}">>},
{rabbitmq_vhost, <<"{{rabbitmq_vhost}}">>},
{rabbitmq_exchange, <<"{{rabbitmq_exchange}}">>},
{authz_root_url, "{{authz_root_url}}" },
{keyring, [{default, "{{keyring_default}}"}]},
{keyring_dir, "{{keyring_dir}}"}
{rabbitmq_exchange, <<"">>},
{solr_url, "{{solr_url}}" }
]},
{sqerl, [
%% The database system you are using (e.g., mysql, pgsql)
{db_type, {{db_type}} },
{chef_objects, [
{certificate_root_url, "http://localhost/dontcare/certificates"},
{s3_access_key_id, "bleh"},
{s3_secret_key_id, "blag"},
{s3_url, "http://localhost/dontcare"},
{s3_platform_bucket_name, "bucket"},
{s3_url_ttl, 28800},
{s3_parallel_ops_timeout, 5000},
{s3_parallel_ops_fanout, 20}
]},
{sqerl, [
%% Database connection parameters
{db_host, "{{db_host}}" },
{db_host, "{{db_host}}"},
{db_port, {{db_port}} },
{db_user, "{{db_user}}" },
{db_pass, "{{db_pass}}" },
{db_name, "{{db_name}}" },
{prepared_statements, {chef_sql, statements, [ {{db_type}} ]} },
%% what's this?
{column_transforms, undefined}
{db_user, "{{db_user}}"},
{db_pass, "{{db_pass}}"},
{db_name, "{{db_name}}"},
{db_timeout, {{db_timeout}} },
{idle_check, 10000},
{prepared_statements, {oc_chef_sql, statements, [pgsql]}},
{column_transforms,
[{<<"created_at">>,
{sqerl_transformers, convert_YMDHMS_tuple_to_datetime}},
{<<"updated_at">>,
{sqerl_transformers, convert_YMDHMS_tuple_to_datetime}}]}
]},
{pooler, [
{pools, [[{name, "sqerl"},
{pools, [[{name, sqerl},
{max_count, {{db_pool_size}} },
{init_count, {{db_pool_size}} },
{start_mfa, {sqerl_client, start_link, []}}]]},
{metrics_module, folsom_metrics}
]},
{darklaunch, [
{config, "{{darklaunch_config}}" },
{reload_time, {{darklaunch_reload_time}} }
]}
{ibrowse, [
{default_max_sessions, {{ibrowse_max_sessions}} },
{default_max_pipeline_size, {{ibrowse_max_pipeline_size}} }
]},
{moser, [
{moser_dets_dir, "/tmp/moser"},
{couch_path, "/tmp/couch"},
{purge_chunksize, 10},
{purge_throttle, 0},
{purge_backup, false},
{purge_auth, false},
{purge_backup_dir, ""}
]},
{folsom_graphite,[ {application, "moser"}]},
{stats_hero, [
%% Set sender pool size to DB max_connections to avoid contention
{udp_socket_pool_size, {{udp_socket_pool_size}} },
{estatsd_host, "{{estatsd_host}}"},
{estatsd_port, {{estatsd_port}} }
]},
{mover, [
{eredis_host, "{{redis_host}}"},
{eredis_port, {{redis_port}} },
{dry_run, {{dry_run}} },
{sleep_time, 0},
{solr_url, "{{solr_url}}" }
]},
{chef_reindex, [
{solr_service, [{root_url, "{{solr_url}}" },
{timeout, {{solr_timeout}} },
{init_count, {{solr_http_init_count}} },
{max_count, {{solr_http_max_count}} },
{cull_interval, {{solr_http_cull_interval}} },
{max_age, {{solr_http_max_age}} },
{max_connection_duration, {{solr_http_max_connection_duration}} },
{ibrowse_options,[{connect_timeout, 10000}] }]
}
]}
].
@@ -10,7 +10,18 @@
{estatsd_port, 5665}.
{udp_socket_pool_size, 5}.
{bulk_fetch_batch_size, 5}.
%% Solr
{solr_url, "http://localhost:8983/solr"}.
{solr_timeout, 30000}.
{solr_http_init_count, 25}.
{solr_http_max_count, 100}.
{solr_http_cull_interval, {1, min}}.
{solr_http_max_age, {70, sec}}.
{solr_http_max_connection_duration, {70,sec}}.
{ibrowse_max_sessions, 256}.
{ibrowse_max_pipeline_size, 1}.
%% AMQP Connection info
{rabbitmq_host, "127.0.0.1"}.
@@ -58,15 +69,20 @@
%% "http://darklaunch2"]}.
{preload_org_count, 15}.
%% db_type, db_port, db_user, db_pass, and db_name are all set in
%% db_vars.config as an overlay
{db_type, mysql}.
{db_host, "localhost"}.
{db_pool_size, 5}.
{db_host, "localhost"}.
{db_port, 3306}.
{db_user, "dev"}.
{db_pass, "opensesame"}.
{db_name, "opscode_chef"}.
{db_pool_size, 5}.
{db_timeout, 5000}.
%% Moser config
{moser_data, ""}.
{moser_couch_data, ""}.
{purge_chunksize, 0}.
{purge_throttle, 0}.
{purge_backup, 0}.
{purge_auth, 0}.
{purge_backup_dir, ""}.
View
@@ -1,6 +1,27 @@
{release,{mover,"12.1.0"},[
%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
%% ex: ts=4 sw=4 ft=erlang et
{release,{mover,"12.1.1"},[
mover,
moser,
jiffy,
eredis,
{darklaunch, load},
bear,
folsom,
chef_authn,
erlware_commons,
mini_s3,
mnesia,
oauth,
opscoderl_folsom,
opscoderl_wm,
quickrand,
ssh,
uuid,
debugger,
hipe,
runtime_tools,
{decouch, load},
{chef_db, load},
{chef_objects, load},
@@ -2,7 +2,7 @@
%% ex: ts=4 sw=4 et
{application, mover,
[{description, ""},
{vsn, "0.1"},
{vsn, "12.1.1"},
{applications, [kernel,
stdlib,
sasl,
@@ -13,6 +13,8 @@
lager,
bcrypt,
chef_reindex,
bear,
folsom,
stats_hero]},
{mod, {mover_app, []}}
]}.

0 comments on commit 39298c1

Please sign in to comment.