CLOUD-464: Updates for Reconciliation

attributes/default.rb

@@ -43,12 +43,12 @@
 default['cloud']['cloudwatch']['download_url']['centos']   = "https://s3.amazonaws.com/amazoncloudwatch-agent/centos/amd64/#{node['cloud']['cloudwatch']['agent_version']}/amazon-cloudwatch-agent.rpm"
 
 default['cloud']['init']['expat_dir']                      = "#{node['cloud']['init']['install_dir']}/expat"
-default['cloud']['ndb-agent']['version']                   = "0.11.0-SNAPSHOT"
+default['cloud']['ndb-agent']['version']                   = "1.0"
 default['cloud']['ndb-agent']['base_dir']                  = "#{node['cloud']['install_dir']}/ndb-agent/ndb-agent-#{node['cloud']['ndb-agent']['version']}"
 default['cloud']['ndb-agent']['home']                      = "#{node['cloud']['install_dir']}/ndb-agent/ndb-agent"
 default['cloud']['ndb-agent']['bin']                       = "#{node['cloud']['ndb-agent']['home']}/bin"
 default['cloud']['ndb-agent']['config']                    = "#{node['cloud']['ndb-agent']['home']}/config"
-default['cloud']['ndb-agent']['log-level']                 = "debug"
+default['cloud']['ndb-agent']['log-level']                 = "info"
 default['cloud']['ndb-agent']['templates-dir']             = "#{node['cloud']['ndb-agent']['home']}/templates"
 
 default['cloud']['metrics']['dir']                         = "#{node["cloud"]["install_dir"]}/cloud-metrics-collector"

recipes/ndb.rb

@@ -46,9 +46,6 @@
         tar xzf #{Chef::Config['file_cache_path']}/#{filename} -C #{Chef::Config['file_cache_path']}
         cp #{Chef::Config['file_cache_path']}/#{ndb_agent_folder}/ndb-agent #{node['cloud']['ndb-agent']['bin']}
         chmod 750 #{node['cloud']['ndb-agent']['bin']}/ndb-agent
-
-        cp -r #{Chef::Config['file_cache_path']}/#{ndb_agent_folder}/contrib #{node['cloud']['ndb-agent']['bin']}
-        chmod -R 750 #{node['cloud']['ndb-agent']['bin']}/contrib
     EOH
     not_if { File.exist? "#{node['cloud']['ndb-agent']['bin']}/ndb-agent" }
 end
@@ -67,14 +64,10 @@
     })
 end
 
-remote_directory "#{node['cloud']['ndb-agent']['templates-dir']}" do
-    source 'ndb_templates'
+directory "#{node['cloud']['ndb-agent']['templates-dir']}" do
     owner 'root'
     group 'root'
     mode 0750
-    files_owner 'root'
-    files_group 'root'
-    files_mode 0550
 end
 
 template "#{node['cloud']['ndb-agent']['templates-dir']}/join_hopsworks_cluster.sh" do

templates/default/ndb-agent/config.yml.erb

@@ -1,17 +1,14 @@
 general:
   log-level: <%= node['cloud']['ndb-agent']['log-level'] %>
-  handler-channel-size: 20
-  cluster-topology-location: <%= node['cloud']['ndb-agent']['config'] %>/cluster-topology.json
   backup-staging-directory: <%= node['ndb']['BackupDataDir'] %>
-  extra-mysqld-vms: 1
+  public-state-filepath: <%= node['cloud']['ndb-agent']['config'] %>/public-state.json
+  fallback-service-discovery: true
+  agent-running-since-filepath: <%= node['cloud']['ndb-agent']['config'] %>/agent-running-since.txt
 
 http:
-  listen-port: 8181
   api-key: API_KEY
 
-heartbeat:
-  enabled: HEARTBEAT_ENABLED
-  endpoint: HEARTBEAT_ENDPOINT
+leader:
   is-leader: HEARTBEAT_ENABLED
   cloud-base-endpoint: HEARTBEAT_ENDPOINT
 
@@ -20,18 +17,12 @@ templates:
   ndb-config-target: <%= node['ndb']['root_dir'] %>/config.ini
   benchmarks-target-home: <%= node['ndb']['user-home']%>/benchmarks
 
-rondb-internal:
-  base:
-    mysqld-start-timeout: "2h"
+timeouts:
+  start-ndbds: "2h"
+  start-mysqlds: "2h"
 
 <% if @template_db_section -%>
 database:
   hostname: 127.0.0.1
   username: root
 <% end -%>
-
-plugins:
-  unmarshal:
-    Clusterpoststartunmarshal: <%= node['cloud']['ndb-agent']['bin'] %>/contrib/plugins/hopsworks_plugin.so
-  handlers:
-    Clusterpoststarthandler: <%= node['cloud']['ndb-agent']['bin'] %>/contrib/plugins/hopsworks_plugin.so