Merge "Change the cookbook to match the service config file changes."

dev_setup/cookbooks/mongodb/templates/default/mongodb_gateway.yml.erb

@@ -10,6 +10,7 @@ host: localhost
 index: 0
 token: <%= node[:mongodb][:token] %>
 mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
-log_level: DEBUG
 pid: /var/vcap/sys/run/mongodb_service.pid
+logging:
+  level: debug
 # allow_over_provisioning: false

dev_setup/cookbooks/mongodb/templates/default/mongodb_node.yml.erb

@@ -3,7 +3,6 @@ local_db: sqlite3:/var/vcap/services/mongodb/mongodb_node.db
 mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
 index: <%= node[:mongodb][:index] %>
 base_dir: /var/vcap/services/mongodb/instances
-log_level: DEBUG
 pid: /var/vcap/sys/run/mongodb_node.pid
 available_memory: <%= node[:mongodb][:available_memory] %>
 max_memory: <%= node[:mongodb][:max_memory] %>
@@ -14,3 +13,5 @@ port_range:
   first: 25001
   last: 45000
 migration_nfs: /mnt/migration
+logging:
+  level: debug

dev_setup/cookbooks/mysql/templates/default/mysql_gateway.yml.erb

@@ -9,7 +9,8 @@ service:
 host: localhost
 index: 0
 token: <%= node[:mysql][:token] %>
-log_level: DEBUG
 mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
 pid: /var/vcap/sys/run/mysql_service.pid
 node_timeout: 2
+logging:
+  level: debug

dev_setup/cookbooks/mysql/templates/default/mysql_node.yml.erb

@@ -6,7 +6,6 @@ gzip_bin: gzip
 mysql_bin: mysql
 mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
 index: <%= node[:mysql][:index] %>
-log_level: DEBUG
 pid: /var/vcap/sys/run/mysql_node.pid
 available_storage: <%= node[:mysql][:available_storage] %>
 node_id: <%= "mysql_node_#{node[:mysql][:index]}" %>
@@ -19,3 +18,5 @@ mysql:
   port: 3306
   user: <%= node[:mysql][:server_root_user] %>
   pass: <%= node[:mysql][:server_root_password] %>
+logging:
+  level: debug

dev_setup/cookbooks/redis/templates/default/redis_gateway.yml.erb

@@ -9,7 +9,9 @@ service:
 host: localhost
 index: 0
 token: <%= node[:redis][:token] %>
-log_level: DEBUG
 mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
 pid: /var/vcap/sys/run/redis_service.pid
+logging:
+  level: debug
+
 # allow_over_provisioning: false

dev_setup/cookbooks/redis/templates/default/redis_node.yml.erb

@@ -3,7 +3,6 @@ local_db: sqlite3:/var/vcap/services/redis/redis_node.db
 mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
 index: <%= node[:redis][:index] %>
 base_dir: /var/vcap/services/redis/instances
-log_level: DEBUG
 pid: /var/vcap/sys/run/redis_node.pid
 available_memory: <%= node[:redis][:available_memory] %>
 max_memory: <%= node[:redis][:max_memory] %>
@@ -14,3 +13,5 @@ port_range:
   first: 5000
   last: 25000
 migration_nfs: /mnt/vcap
+logging:
+  level: debug