Merge pull request #33 from rightscale-cookbooks/st_15_02_remove_clou…

…dstack_ip_workaround Remove logic to ignore cloud/public_ips for server-id on cloudstack.
rightscale-cookbooks · Jan 21, 2015 · 9eb585e · 9eb585e
2 parents 128a858 + 96f6730
commit 9eb585e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ rs-mysql Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the rs-mysql cookbook.
 
+v1.1.6
+------
+
+- Remove logic to ignore cloud/public_ips for server-id on cloudstack.
+
 v1.1.5
 ------
 

diff --git a/libraries/helper.rb b/libraries/helper.rb
@@ -34,8 +34,7 @@ module Helper
     def self.get_server_ip(node)
       instance_ips = Array.new
 
-      # For cloudstack, ignore 'cloud/public_ips'
-      if node['cloud']['public_ips'] && node['cloud']['provider'] != 'cloudstack'
+      if node['cloud']['public_ips']
         instance_ips += node['cloud']['public_ips']
       end
 

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs and configures a MySQL server'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.5'
+version          '1.1.6'
 
 depends 'chef_handler', '~> 1.1.6'
 depends 'marker', '~> 1.0.1'
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,11 @@ rs-mysql Cookbook CHANGELOG @@
     This file is used to list changes made in each version of the rs-mysql cookbook.
+    v1.1.6
+    ------
+    - Remove logic to ignore cloud/public_ips for server-id on cloudstack.
     v1.1.5
     ------
@@ Expand Down @@