Merge pull request #66 from galstrom21/ubuntu-precise

node[:controller_ipaddress] has to be set before other variables can utilize it.
rcbops · Mar 28, 2012 · 16faee8 · 16faee8
2 parents 0855f6e + 45afa48
commit 16faee8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cookbooks/glance/attributes/default.rb b/cookbooks/glance/attributes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+default[:controller_ipaddress] = node[:ipaddress]
+
 default[:glance][:db] = "glance"
 default[:glance][:db_user] = "glance"
 default[:glance][:db_passwd] = "glance"
@@ -38,5 +40,3 @@
 default[:glance][:image][:maverick] = "http://c250663.r63.cf1.rackcdn.com/ubuntu-10.10-server-uec-amd64-multinic.tar.gz"
 #default[:glance][:image][:tty] = "http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-12.1_2.6.35-22_1.tar.gz"
 default[:glance][:image][:tty] = "http://c250663.r63.cf1.rackcdn.com/ttylinux.tgz"
-
-default[:controller_ipaddress] = node[:ipaddress]
diff --git a/cookbooks/keystone/attributes/default.rb b/cookbooks/keystone/attributes/default.rb
@@ -1,3 +1,5 @@
+default[:controller_ipaddress] = node[:ipaddress]
+
 default[:keystone][:db] = "keystone"
 default[:keystone][:db_user] = "keystone"
 default[:keystone][:db_passwd] = "keystone"
@@ -12,5 +14,3 @@
 default[:nova][:api_ipaddress] = node[:controller_ipaddress]
 
 default[:keystone][:roles] = [ "admin", "Member", "KeystoneAdmin", "KeystoneServiceAdmin", "sysadmin", "netadmin" ]
-
-default[:controller_ipaddress] = node[:ipaddress]