From c67f75db82c6b776db5ba350ce84b29383ff6083 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Sat, 4 Jun 2011 16:34:39 -0400
Subject: [PATCH] Added vpc::my_ip recipe to set the nova :my_ip attribute.
 Since VPC assigns IP addresses dynamically we need to do this to avoid having
 the IP address swap out on the nova-network node.

---
 cookbooks/vpc/recipes/my_ip.rb | 20 ++++++++++++++++++++
 roles/nova-base.rb             |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 cookbooks/vpc/recipes/my_ip.rb

diff --git a/cookbooks/vpc/recipes/my_ip.rb b/cookbooks/vpc/recipes/my_ip.rb
new file mode 100644
index 0000000..0dd9f09
--- /dev/null
+++ b/cookbooks/vpc/recipes/my_ip.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: vpc
+# Recipe:: my_ip
+#
+# Copyright 2011, Rackspace
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+node[:nova][:my_ip] = %x{cat /etc/hosts | grep $(hostname -f)}.split[0]
diff --git a/roles/nova-base.rb b/roles/nova-base.rb
index f5ef842..17257c9 100644
--- a/roles/nova-base.rb
+++ b/roles/nova-base.rb
@@ -2,6 +2,7 @@ name "nova-base"
 
 run_list(
 	"recipe[apt::noauth]",
+	"recipe[vpc::my_ip]",
 	"recipe[vpc::apt_config]",
     "recipe[nova::common]"
 )