openstack
/
openstack-chef
Code Issues Proposed changes

AIO-Neutron changes 

It seems there are some changes that the local creation of aio-neutron
need to be updated with. This will fix and get aio-neutron working again.

Change-Id: I25881480e1fec261b5113a7b22d8cdc17bc286ac
This commit is contained in:
JJ Asghar 2015-06-29 15:59:17 -05:00
parent f7d1057c6b
commit 3549f970b1
6 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aio-neutron.rb
View File

@ -4,6 +4,7 @@ controller_config = <<-ENDCONFIG
config.vm.network "forwarded_port", guest: 443, host: 9443
config.vm.network "forwarded_port", guest: 4002, host: 4002
config.vm.network "forwarded_port", guest: 5000, host: 5000
config.vm.network "forwarded_port", guest: 6080, host: 6080
config.vm.network "forwarded_port", guest: 8773, host: 8773
config.vm.network "forwarded_port", guest: 8774, host: 8774
config.vm.network "forwarded_port", guest: 35357, host: 35357
@ -13,7 +14,8 @@ controller_config = <<-ENDCONFIG
v.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
end
config.vm.network "private_network", ip: "172.16.0.254"
config.vm.network "public_network",
bridge: '<put your interface device name here>'
ENDCONFIG
env = 'vagrant-aio-neutron'

3
aio-nova.rb
View File

@ -14,7 +14,8 @@ controller_config = <<-ENDCONFIG
v.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
end
config.vm.network "private_network", ip: "192.168.100.60"
config.vm.network "public_network",
bridge: '<put your interface device name here>'
ENDCONFIG
env = 'vagrant-aio-nova'

19
doc/aio-neutron.md
View File

@ -1,3 +1,20 @@
# All in One with Neutron
The defaults in the aio-neutron.rb and the environments/vagrant-aio-neutron.json should work without any changes.
Note: Default operating system is Ubuntu. If you would like CentOS, set env var REPO_OS=centos7
## Networking setup
Changes need to be made to the multi-nova.rb and the environments\vagrant-multi-nova.json or environments\vagrant-multi-centos7-nova.json file.
### Bridge IP Address
Should be empty. With OVS which is what we support at the moment, OVS requires you not to have an IP associated with the NIC. If you do have DHCP enabled and the machine gains an IP you should delete it via something like: `sudo ip addr del 172.16.100.17/24 dev eth1` where `172.16.100.17` was the DHCP leased address.
### Device interface
The device interface must be is specified by name in the multi-neutron.rb file.
There one place to change, look for `<put your interface device name here>`, this is because of OVS and it needing to slurp up an adapter for internet access.
+ For Windows 7, open the Control Panel, Network and Internet, Network Connections. Look in the Connectivity column for a row with "Internet access", and use the "Device Name". For example, 'Intel(R) Centrino(R) Advanced-N 6205'.
+ For Mac, this works from some: `'en0: Wi-Fi (AirPort)'`, but there is an issue with VirtualBox and the Airport. You should look into using an Ethernet adaptor and something like: `'en3: Ethernet'`
+ For Linux, ...TODO...

11
doc/aio-nova.md
View File

@ -3,3 +3,14 @@
The defaults in the aio-nova.rb and the environments/vagrant-aio-nova.json should work without any changes.
Note: Default operating system is Ubuntu. If you would like CentOS, set env var REPO_OS=centos7
### Device interface
The device interface must be is specified by name in the multi-nova.rb file.
There are is one place to change, look for `<put your interface device name here>`.
This is for an extra network adapter to your network, this is good practise for the
more advance setups.
+ For Windows 7, open the Control Panel, Network and Internet, Network Connections. Look in the Connectivity column for a row with "Internet access", and use the "Device Name". For example, 'Intel(R) Centrino(R) Advanced-N 6205'.
+ For Mac, this works from some: `'en0: Wi-Fi (AirPort)'`, but there is an issue with VirtualBox and the Airport. You should look into using an Ethernet adaptor and something like: `'en3: Ethernet'`
+ For Linux, ...TODO...

2
environments/integration-aio-neutron.json
View File

@ -1,5 +1,5 @@
{
"name": "vagrant-aio-neutron",
"name": "integration-aio-neutron",
"description": "Environment used in testing the upstream cookbooks and reference Chef repository with vagrant. To be used with the Vagrantfile-aio-neutron vagrantfile. Defines the necessary attributes for a working all-in-one openstack deployment, using neutron for the networking component, and the openvswitch neutron plugin",
"cookbook_versions": {
},

30
environments/vagrant-aio-neutron.json
View File

@ -8,37 +8,22 @@
"default_attributes": {
},
"override_attributes": {
"mysql": {
"allow_remote_root": true,
"root_network_acl": ["%"]
},
"openstack": {
"mq": {
"user": "admin"
},
"endpoints": {
"bind-host": "0.0.0.0",
"host": "0.0.0.0",
"identity-bind": {
"host": "0.0.0.0"
},
"bind-host": "0.0.0.0"
}
},
"mq": {
"user": "admin"
},
"network": {
"service_plugins": [ "neutron.services.l3_router.l3_router_plugin.L3RouterPlugin" ],
"dhcp": {
"enable_isolated_metadata": "True"
},
"openvswitch": {
"tunnel_id_ranges": "1:1000",
"enable_tunneling": "True",
"tunnel_type": "gre",
"tenant_network_type": "gre"
},
"api": {
"bind_interface": "eth1"
},
"quota": {
"floatingip": "50"
},
"l3":{
"external_network_bridge_interface": "eth1"
}
@ -62,9 +47,6 @@
"network": {
"service_type": "neutron"
},
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"virt_type": "qemu"
}