Merge pull request #824 from caskdata/feature/cook-11

Import cdap version 1.1.0

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/Berksfile

@@ -1,4 +1,4 @@
-site :opscode
+source 'https://supermarket.getchef.com'
 
 group :integration do
   cookbook 'minitest-handler'

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/attributes/config.rb

@@ -19,7 +19,7 @@
 
 # Default: conf.chef
 default['cdap']['conf_dir'] = 'conf.chef'
-# Default: 2.5.1
+# Default: 2.5.2-1
 default['cdap']['version'] = '2.5.2-1'
 # cdap-site.xml
 default['cdap']['cdap_site']['root.namespace'] = 'cdap'

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/metadata.json

@@ -47,5 +47,5 @@
   "recipes": {
 
   },
-  "version": "1.0.2"
+  "version": "1.1.0"
 }

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/metadata.rb

@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures Cask Data Application Platform (CDAP)'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.2'
+version          '1.1.0'
 
 %w(apt hadoop java nodejs ntp yum yum-epel).each do |cb|
   depends cb

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/recipes/fullstack.rb

@@ -19,8 +19,6 @@
 
 include_recipe 'cdap::default'
 
-include_recipe 'cdap::gateway' if node['cdap']['version'].to_f < 2.6
-
-%w(kafka master web_app).each do |recipe|
+%w(gateway kafka master web_app).each do |recipe|
   include_recipe "cdap::#{recipe}"
 end

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/recipes/gateway.rb

@@ -24,7 +24,14 @@
   version node['cdap']['version']
 end
 
-%w(cdap-gateway cdap-router).each do |svc|
+svcs = ['cdap-router']
+unless node['cdap']['version'].to_f >= 2.6
+  unless node['cdap']['version'].split('.')[2].to_i >= 9000
+    svcs += ['cdap-gateway']
+  end
+end
+
+svcs.each do |svc|
   service svc do
     status_command "service #{svc} status"
     action :nothing

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/recipes/security_init.rb

@@ -21,7 +21,16 @@
 
 # Create a new keystore if SSL is enabled
 execute 'create-security-server-ssl-keystore' do
-  ssl_enabled = node['cdap']['cdap_site']['security.server.ssl.enabled'] || false
+  ssl_enabled =
+    if node['cdap']['version'].to_f < 2.5 && node['cdap'].key?('cdap_site') &&
+       node['cdap']['cdap_site'].key?('security.server.ssl.enabled')
+      node['cdap']['cdap_site']['security.server.ssl.enabled']
+    elsif node['cdap'].key?('cdap_site') && node['cdap']['cdap_site'].key?('ssl.enabled')
+      node['cdap']['cdap_site']['ssl.enabled']
+    else
+      false
+    end
+
   password = node['cdap']['cdap_site']['security.server.ssl.keystore.password']
   path = node['cdap']['cdap_site']['security.server.ssl.keystore.path']
   common_name = node['cdap']['security']['ssl_common_name']

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/cdap/recipes/web_app_init.rb

@@ -23,7 +23,16 @@
 
 ### Generate a certificate if SSL is enabled
 execute 'generate-webapp-ssl-cert' do
-  ssl_enabled = node['cdap']['cdap_site']['ssl.enabled'] || false
+  ssl_enabled =
+    if node['cdap']['version'].to_f < 2.5 && node['cdap'].key?('cdap_site') &&
+       node['cdap']['cdap_site'].key?('security.server.ssl.enabled')
+      node['cdap']['cdap_site']['security.server.ssl.enabled']
+    elsif node['cdap'].key?('cdap_site') && node['cdap']['cdap_site'].key?('ssl.enabled')
+      node['cdap']['cdap_site']['ssl.enabled']
+    else
+      false
+    end
+
   common_name = node['cdap']['security']['ssl_common_name']
   keypath = node['cdap']['cdap_site']['dashboard.ssl.key']
   certpath = node['cdap']['cdap_site']['dashboard.ssl.cert']

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/ntp/CHANGELOG.md

@@ -2,6 +2,16 @@ ntp Cookbook CHANGELOG
 ======================
 This file is used to list changes made in each version of the ntp cookbook.
 
+v1.6.8 (2014-12-04)
+-------------------
+- **[PR #81](https://github.com/gmiranda23/ntp/pull/81)** - Update to berkshelf3
+
+v1.6.6 (2014-12-02)
+-------------------
+- **[PR #76](https://github.com/gmiranda23/ntp/pull/76)** - Overhauled Testing
+- **[PR #68](https://github.com/gmiranda23/ntp/pull/68)** - Updated Leapseconds
+- **[PR #51](https://github.com/gmiranda23/ntp/pull/51)** - Berksfile source deprecation
+
 v1.6.5 (2014-09-25)
 -------------------
 - Ensure that ntp version is captured

coopr-provisioner/worker/plugins/automators/chef_solo_automator/resources/cookbooks/ntp/README.md

@@ -1,6 +1,6 @@
 NTP Cookbook
 ============
-[![Build Status](https://secure.travis-ci.org/opscode-cookbooks/ntp.png?branch=master)](http://travis-ci.org/opscode-cookbooks/ntp)
+[![Build Status](https://secure.travis-ci.org/gmiranda23/ntp.png?branch=master)](http://travis-ci.org/gmiranda23/ntp)
 
 Installs and configures ntp. On Windows systems it uses the Meinberg port of the standard NTPd client to Windows.
 
@@ -157,7 +157,7 @@ If for some reason you need to stop and remove the ntp daemon, you can apply thi
 
 ### windows_client recipe
 
-Windows only. Apply on a Windows host to install the Meinberg NTPd client. 
+Windows only. Apply on a Windows host to install the Meinberg NTPd client.
 
 
 Development
@@ -179,10 +179,8 @@ This section details "quick development" steps. For a detailed explanation, see
 4. **Write tests**
 5. Make your changes/patches/fixes, committing appropriately
 6. Run the tests:
-    - `bundle exec foodcritic -f any .`
-    - `bundle exec rspec`
-    - `bundle exec rubocop`
-    - `bundle exec kitchen test`
+    - `bundle exec rake`
+    - `bundle exec rake kitchen`
 
   In detail:
     - Foodcritic will catch any Chef-specific style errors