Merge pull request crowbar#27 from VictorLowther/pull-req-feature-ip-…

…hacking-master-bf15337413 Rewrite network barclamp to manage interfaces directly. [10/22]
dellcloudedge · Jun 25, 2012 · 529e8a8 · 529e8a8
2 parents e2787d2 + bf15337
commit 529e8a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/chef/cookbooks/keystone/recipes/monitor.rb b/chef/cookbooks/keystone/recipes/monitor.rb
@@ -20,7 +20,7 @@
 # if monitored by nagios, install the nrpe commands
 
 # Node addresses are dynamic and can't be set from attributes only.
-my_ipaddress = Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, "admin").address
+my_ipaddress = node.address.addr
 
 node[:keystone][:monitor] = {} if node[:keystone][:monitor].nil?
 node[:keystone][:monitor][:svcs] = [] if node[:keystone][:monitor][:svcs].nil?

diff --git a/chef/cookbooks/keystone/recipes/server.rb b/chef/cookbooks/keystone/recipes/server.rb
@@ -47,7 +47,7 @@
         mysql = node
     end
 
-    mysql_address = Chef::Recipe::Barclamp::Inventory.get_network_by_type(mysql, "admin").address if mysql_address.nil?
+    mysql_address = mysql.address.addr
     Chef::Log.info("Mysql server found at #{mysql_address}")
 
     # Create the Keystone Database
@@ -104,8 +104,8 @@
   action :run
 end
 
-my_ipaddress = Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, "admin").address
-pub_ipaddress = Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, "public").address rescue my_ipaddress
+my_ipaddress = node.address.addr
+pub_ipaddress = node.address("public").addr
 
 # Silly wake-up call - this is a hack
 keystone_register "wakeup keystone" do