Merge pull request #30 from rightscale-cookbooks/upgrade-rightscale-tag

updating tags

.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
+- 2.0.0
+- 1.9.3
 before_script: bundle exec berks install
 script: bundle exec strainer test --except kitchen
 notifications:
   slack:
-    secure: LBbaBXSsTB9a9CQ2B4+B5IW8AaMbfDgbubni2PgkHQWydn42qx/hpm8OsT2YVU6CS43tqVQ84s+lUGh4db4die/Ux7A0unnTqhSSatLp6T/vWtcigjopAEfIp+RmZ5C8hZU7onekyta+36tCRBSJRm3KrRQnkTkfA9nwpJSV/wo=
+    secure: G1mZOPR7erF/ongaNY6oATvlG84W9AdnSVODE0fmDAMrO+FQUGiiSfxkq/OBwmCqWnFdaKK2/Ix15sYgmiVoTbw5JNjZiipL73Wsw++zemSpUoYKnfTxd5CBB0C3l1AqiphVSpOj7BmRgg38QUSguB8CWbtmQqqGMt7JRSwQL5o=

Berksfile

@@ -3,8 +3,8 @@ site :opscode
 metadata
 
 cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu'
-cookbook 'rightscale_tag', github: 'rightscale-cookbooks/rightscale_tag'
-cookbook 'machine_tag', github: 'rightscale-cookbooks/machine_tag'
+cookbook 'rightscale_tag', github: 'rightscale-cookbooks/rightscale_tag', branch: 'v1.2.1'
+cookbook 'machine_tag', github: 'rightscale-cookbooks/machine_tag', branch: 'v1.2.1'
 
 group :integration do
   cookbook 'apt', '~> 2.9.2'

CHANGELOG.md

@@ -3,6 +3,16 @@ rs-base Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the rs-base cookbook.
 
+v1.3.0
+------
+
+- adding support for rightscale_tag(1.2.1) and machine_tag(1.2.1)
+
+v1.2.0
+------
+
+- Adding RightLink 10 support
+
 v1.1.6
 ------
 

metadata.rb

@@ -4,60 +4,61 @@
 license          'Apache 2.0'
 description      'Installs/Configures rs-base'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.2.0'
+version          '1.3.0'
 
-supports "centos"
-supports "ubuntu"
+supports 'centos'
+supports 'ubuntu'
 
 depends 'apt', '~> 2.9.2'
-depends "ntp", "~> 1.4.0"
+depends 'ntp', '~> 1.4.0'
 depends 'marker', '~> 1.0.1'
-depends 'rightscale_tag', '~> 1.1.0'
-depends "swap", "~> 0.3.5"
-depends "rsyslog", "~> 1.12.2"
-depends "collectd", "~> 1.1.0"
+depends 'rightscale_tag', '~> 1.2.1'
+depends 'machine_tag', '~> 1.2.1'
+depends 'swap', '~> 0.3.5'
+depends 'rsyslog', '~> 1.12.2'
+depends 'collectd', '~> 1.1.0'
 
-recipe "rs-base::default", "All-in-one recipe to run all recipes in rs-base cookbook."
-recipe "rs-base::ntp", "Installs and configures ntp client."
-recipe "rs-base::swap", "Create and setup a swap file."
-recipe "rs-base::rsyslog", "Install and setup rsyslog."
-recipe "rs-base::collectd", "Install and setup collectd and basic set of plugins"
+recipe 'rs-base::default', 'All-in-one recipe to run all recipes in rs-base cookbook.'
+recipe 'rs-base::ntp', 'Installs and configures ntp client.'
+recipe 'rs-base::swap', 'Create and setup a swap file.'
+recipe 'rs-base::rsyslog', 'Install and setup rsyslog.'
+recipe 'rs-base::collectd', 'Install and setup collectd and basic set of plugins'
 
-attribute "rs-base/ntp/servers",
-  :display_name => "NTP Servers",
+attribute 'rs-base/ntp/servers',
+  :display_name => 'NTP Servers',
   :description =>
-    "A comma-separated list of fully qualified domain names" +
-    " for the array of servers that instances should talk to." +
-    " Example: time1.example.com, time2.example.com, time3.example.com",
-  :recipes => ["rs-base::default", "rs-base::ntp"],
-  :required => "optional",
-  :type => "array",
+    'A comma-separated list of fully qualified domain names' +
+    ' for the array of servers that instances should talk to.' +
+    ' Example: time1.example.com, time2.example.com, time3.example.com',
+  :recipes => ['rs-base::default', 'rs-base::ntp'],
+  :required => 'optional',
+  :type => 'array',
   :default => [
-    "time.rightscale.com",
-    "ec2-us-east.time.rightscale.com",
-    "ec2-us-west.time.rightscale.com"
+    'time.rightscale.com',
+    'ec2-us-east.time.rightscale.com',
+    'ec2-us-west.time.rightscale.com'
   ]
 
-attribute "rs-base/swap/size",
-  :display_name => "Swap Size",
+attribute 'rs-base/swap/size',
+  :display_name => 'Swap Size',
   :description =>
-    "The size of the swap file (in Gigabytes). This value should be an integer." +
-    " Example: 1",
-  :recipes => ["rs-base::default", "rs-base::swap"],
-  :required => "optional",
-  :default => "1"
+    'The size of the swap file (in Gigabytes). This value should be an integer.' +
+    ' Example: 1',
+  :recipes => ['rs-base::default', 'rs-base::swap'],
+  :required => 'optional',
+  :default => '1'
 
-attribute "rs-base/rsyslog_server",
-  :display_name => "Remote rsyslog Server",
+attribute 'rs-base/rsyslog_server',
+  :display_name => 'Remote rsyslog Server',
   :description =>
-    "The FQDN or IP address of the remote rsyslog server.  If blank no remote syslog server is setup.",
-  :recipes => ["rs-base::default", "rs-base::rsyslog"],
-  :required => "optional"
+    'The FQDN or IP address of the remote rsyslog server.  If blank no remote syslog server is setup.',
+  :recipes => ['rs-base::default', 'rs-base::rsyslog'],
+  :required => 'optional'
 
 # This input is required for setting up monitoring and should be set at the ServerTemplate level
-attribute "rs-base/collectd_server",
-  :display_name => "Remote collectd Server",
+attribute 'rs-base/collectd_server',
+  :display_name => 'Remote collectd Server',
   :description =>
-    "The FQDN or IP address of the remote collectd server.",
-  :recipes => ["rs-base::default", "rs-base::collectd"],
-  :required => "optional"
+    'The FQDN or IP address of the remote collectd server.',
+  :recipes => ['rs-base::default', 'rs-base::collectd'],
+  :required => 'optional'