Only create a CNAME if node[cloud_v2] is not nil

When nodes are running in VPC, ohai will set `cloud_v2` to nil. Since VPC nodes don't have public CNAME's (only a public IP), ultimately we'll need to create A-records.
rubygems · Jul 3, 2014 · 2e37b7d · 2e37b7d
1 parent 6c9377c
commit 2e37b7d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -239,7 +239,7 @@ GRAPH
     rubygems-backups (>= 0.0.0)
   rubygems-fail2ban (0.0.2)
     fail2ban (>= 0.0.0)
-  rubygems-hostname (0.1.6)
+  rubygems-hostname (0.1.9)
     chef-vault (>= 0.0.0)
     dwradcliffe-dnsimple (>= 0.0.0)
     hostname (>= 0.0.0)

diff --git a/cookbooks/rubygems-hostname/metadata.rb b/cookbooks/rubygems-hostname/metadata.rb
@@ -2,7 +2,7 @@
 maintainer       'RubyGems.org Ops Team'
 license          'MIT'
 description      'Set the hostname of RubyGems.org machines using node.name'
-version          '0.1.6'
+version          '0.1.9'
 
 depends 'chef-vault'
 depends 'dwradcliffe-dnsimple'

diff --git a/cookbooks/rubygems-hostname/recipes/dns.rb b/cookbooks/rubygems-hostname/recipes/dns.rb
@@ -9,12 +9,14 @@
 
 include_recipe 'dwradcliffe-dnsimple'
 
-dwradcliffe_dnsimple_record "create a CNAME record for #{node.name}" do
-  name     node.name.sub('.rubygems.org', '')
-  content  node['cloud_v2']['public_hostname']
-  type     'CNAME'
-  domain   'rubygems.org'
-  username dnsimple_credentials['username']
-  password dnsimple_credentials['password']
-  action   :create
+if node['cloud_v2']
+  dwradcliffe_dnsimple_record "create a CNAME record for #{node.name}" do
+    name     node.name.sub('.rubygems.org', '')
+    content  node['cloud_v2']['public_hostname']
+    type     'CNAME'
+    domain   'rubygems.org'
+    username dnsimple_credentials['username']
+    password dnsimple_credentials['password']
+    action   :create
+  end
 end