Skip to content

Instantly share code, notes, and snippets.

@jjasghar
Created March 23, 2015 20:57
Show Gist options
  • Save jjasghar/7d95f3349b72632dbbe1 to your computer and use it in GitHub Desktop.
Save jjasghar/7d95f3349b72632dbbe1 to your computer and use it in GitHub Desktop.
diff --git a/environments/vagrant-aio-nova.json b/environments/vagrant-aio-nova.json
index 43b1d8f..1d5b274 100644
--- a/environments/vagrant-aio-nova.json
+++ b/environments/vagrant-aio-nova.json
@@ -13,6 +13,9 @@
"bind-host": "0.0.0.0",
"host": "0.0.0.0"
},
+ "mq": {
+ "user": "admin"
+ },
"image": {
"image_upload": true,
"upload_images": [
diff --git a/environments/vagrant-multi-nova.json b/environments/vagrant-multi-nova.json
index 975580c..3d7c235 100644
--- a/environments/vagrant-multi-nova.json
+++ b/environments/vagrant-multi-nova.json
@@ -21,6 +21,9 @@
"allow_remote_root": true,
"root_network_acl": ["%"]
},
+ "mq": {
+ "user": "admin"
+ },
"openstack": {
"yum": {
"uri": "https://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7"
@@ -29,13 +32,13 @@
"bind_interface": "eth1"
},
"endpoints": {
- "bind-host": "172.16.100.60",
- "host": "172.16.100.60",
+ "bind-host": "10.0.1.60",
+ "host": "10.0.1.60",
"mq": {
- "host": "172.16.100.60"
+ "host": "10.0.1.60"
},
"db": {
- "host": "172.16.100.60"
+ "host": "10.0.1.60"
},
"compute-vnc-bind":{
"host": "0.0.0.0"
@@ -76,7 +79,7 @@
"networks": [
{
"label": "public",
- "ipv4_cidr": "172.16.100.0/24",
+ "ipv4_cidr": "192.168.100.0/24",
"num_networks": "1",
"network_size": "254",
"bridge": "br100",
diff --git a/multi-nova.rb b/multi-nova.rb
index d450138..b2807f1 100644
--- a/multi-nova.rb
+++ b/multi-nova.rb
@@ -15,8 +15,8 @@ controller_config = <<-ENDCONFIG
v.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
end
- config.vm.network "public_network", ip: "172.16.100.60",
- bridge: '<put your interface device name here>'
+ config.vm.network "public_network", ip: "10.0.1.60",
+ bridge: 'en0: Wi-Fi (AirPort)'
ENDCONFIG
machine 'controller' do
@@ -36,7 +36,7 @@ machine 'controller' do
end
machine_batch do
- [%w(compute1 61), %w(compute2 62), %w(compute3 63)].each do |name, ip_suff|
+ [%w(compute1 61)].each do |name, ip_suff|
machine name do
add_machine_options vagrant_config: <<-ENDCONFIG
config.vm.provider "virtualbox" do |v|
@@ -46,8 +46,8 @@ config.vm.provider "virtualbox" do |v|
v.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
end
-config.vm.network "public_network", ip: "172.16.100.#{ip_suff}",
- bridge: '<put your interface device name here>'
+config.vm.network "public_network", ip: "10.0.1.#{ip_suff}",
+ bridge: 'en0: Wi-Fi (AirPort)'
ENDCONFIG
role 'os-compute-worker'
# if you would like to use centos7 you'll need to
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment