Merge "Rename several variable/machine names"

Vagrantfile

@@ -12,9 +12,9 @@ else
 end
 
 def configure_vm(name, vm, conf)
-  vm.hostname = conf["#{name}_hostname"] or name
+  vm.hostname = conf["hostname_#{name}"] || name
   # we do an L2 bridge directly onto the physical network, which means
-  # that your OpenStack hosts (manager, compute1) are directly in the
+  # that your OpenStack hosts (manager, compute) are directly in the
   # same network as your physical host. Your OpenStack guests (2nd
   # level guests that you create in nova) will be also on the same L2,
   # however they will be in a different address space (10.0.0.0/24 by
@@ -27,9 +27,9 @@ def configure_vm(name, vm, conf)
   vm.provider :virtualbox do |vb|
     # you need this for openstack guests to talk to each other
     vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
-    # allows for stable mac addresses
-    if conf["#{name}_mac"]
-      vb.customize ["modifyvm", :id, "--macaddress2", conf["#{name}_mac"]]
+    # if specified assign a static MAC address
+    if conf["mac_address_#{name}"]
+      vb.customize ["modifyvm", :id, "--macaddress2", conf["mac_address_#{name}"]]
     end
   end
 
@@ -101,9 +101,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     manager.vm.network "forwarded_port", guest: 6080, host: 6080, host_ip: "127.0.0.1"
   end
 
-  if conf['compute1_hostname']
-    config.vm.define "compute1" do |compute1|
-      configure_vm("compute1", compute1.vm, conf)
+  if conf['hostname_compute']
+    config.vm.define "compute" do |compute|
+      configure_vm("compute", compute.vm, conf)
     end
   end
 

config.yaml.sample

@@ -1,5 +1,6 @@
-manager_hostname: api.dague.pvt
-compute1_hostname: compute1.dague.pvt
+hostname_manager: manager.openstack.site
+hostname_compute: compute.openstack.site
+
 stack_pass: somebiglongLinuxpasswordhash
 stack_sshkey: >
   the_ssh_public_key_you_want_for_your_stack_user
@@ -27,5 +28,5 @@ bridge_int: eth1
 
 # You can specify stable mac addresses to keep this from resetting
 # on every create
-# manager_mac: 0800274a508c
-# compute1_mac: 0800274a508d
+# mac_address_manager: 0800274a508c
+# mac_address_compute: 0800274a508d