Skip to content

Add advanced network configuration #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lynic wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Add advanced network configuration #220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3a543c2
Add networks configuration to configure networks
Dec 19, 2016
09d63e7
Update doc
Dec 19, 2016
e7683d0
Add disks properties to add additional disks
Dec 20, 2016
2471cec
Merge branch 'disks' into elynn
Dec 20, 2016
966b2c5
Add missing properties
Dec 20, 2016
939320d
Fix a bug
Dec 20, 2016
2fd348f
Fix network name lookup problem
Dec 20, 2016
36ab1c3
Add property ssh_cidr
Dec 20, 2016
e52b012
Remove debug message
Dec 20, 2016
92904d6
Fix get ssh address error
Dec 21, 2016
f0da972
Add cpu_mmu_type configuration
Dec 23, 2016
e839bc0
Add nested_hv option
Dec 23, 2016
322b6f2
Fix destroy multiple disks won't remove the entire folder
Dec 26, 2016
cf35c4f
Fix disk unit_number
Dec 26, 2016
bc1ee27
Add script to reinstall vsphere plugin
Dec 26, 2016
f1c3678
Add vagrant suspend support
Dec 26, 2016
56797dc
Add vagrant resume action
Dec 26, 2016
7cd9426
Show progress when suspending
Dec 26, 2016
19e5441
Raise error when restore a non-exists snapshot
Jan 1, 2017
dd65267
Modify readme
Jan 10, 2017
6c15726
Do not restrict the highest version of i18n
Mar 7, 2017
54ae551
update
Aug 1, 2017
ce4539b
Add script to add dummy.box
Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update doc
  • Loading branch information
Ethan Lynn committed Dec 19, 2016
commit 09d63e774c1796b35a3c94d5635c02269559eb9b
16 changes: 12 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ Vagrant.configure("2") do |config|
vsphere.name = 'NEW VM NAME'
vsphere.user = 'YOUR VMWARE USER'
vsphere.password = 'YOUR VMWARE PASSWORD'
vsphere.networks = [
{'network': 'VM Network'},
{'network': 'VM Network 2'}
]
end
end
```
Expand Down Expand Up @@ -127,14 +131,10 @@ This provider has the following settings, all are required unless noted:
* `proxy_host` - _Optional_ proxy host name for connecting to vSphere via proxy
* `proxy_port` - _Optional_ proxy port number for connecting to vSphere via
proxy
* `vlan` - _Optional_ vlan to connect the first NIC to
* `memory_mb` - _Optional_ Configure the amount of memory (in MB) for the new VM
* `cpu_count` - _Optional_ Configure the number of CPUs for the new VM
* `mac` - _Optional_ Used to set the mac address of the new VM
* `cpu_reservation` - _Optional_ Configure the CPU time (in MHz) to reserve for this VM
* `mem_reservation` - _Optional_ Configure the memory (in MB) to reserve for this VM
* `addressType` - _Optional_ Configure the address type of the
[vSphere Virtual Ethernet Card](https://www.vmware.com/support/developer/vc-sdk/visdk2xpubs/ReferenceGuide/vim.vm.device.VirtualEthernetCard.html)
* `custom_attribute` - _Optional_ Add a
[custom attribute](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAAahUKEwiWwbWX59jHAhVBC5IKHa3HAEU&url=http%3A%2F%2Fpubs.vmware.com%2Fvsphere-51%2Ftopic%2Fcom.vmware.vsphere.vcenterhost.doc%2FGUID-25244732-D473-4857-A471-579257B6D95F.html&usg=AFQjCNGTSl4cauFrflUJpBeTBb0Yv7R13g&sig2=a9he6W2qVvBSZ5lCiXnENA)
to the VM upon creation. This method takes a key/value pair,
Expand All @@ -151,6 +151,14 @@ This provider has the following settings, all are required unless noted:
adapters exist on a host.
* `ip_address_timeout` _ _Optional_ Maximum number of seconds to wait while an
IP address is obtained
* `networks` - _Optional_ List of networks attached to VM. This property will shadow `vlan`, `addressType`, `mac` properties
* `network` - _Required_ Network name
* `adaptertype` - _Optional_ Either `e1000` or `vmxnet3`
* `mac` - _Optional_ Mac address of this adapter
* `vlan` - (_Deprecated_ Please use `networks` instead)_Optional_ vlan to connect the first NIC to
* `mac` - (_Deprecated_ Please use `networks` instead)_Optional_ Used to set the mac address of the new VM
* `addressType` - (_Deprecated_ Please use `networks` instead)_Optional_ Configure the address type of the
[vSphere Virtual Ethernet Card](https://www.vmware.com/support/developer/vc-sdk/visdk2xpubs/ReferenceGuide/vim.vm.device.VirtualEthernetCard.html)

### Cloning from a VM rather than a template

Expand Down
14 changes: 7 additions & 7 deletions lib/vSphere/action/clone.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ def call(env)

spec[:customization] = get_customization_spec(machine, customization_info) unless customization_info.nil?

# env[:ui].info "Setting custom address: #{config.addressType}" unless config.addressType.nil?
# add_custom_address_type(template, spec, config.addressType) unless config.addressType.nil?
env[:ui].info "Setting custom address: #{config.addressType}" unless config.addressType.nil? || !config.networks.empty?
add_custom_address_type(template, spec, config.addressType) unless config.addressType.nil? || !config.networks.empty?

# env[:ui].info "Setting custom mac: #{config.mac}" unless config.mac.nil?
# add_custom_mac(template, spec, config.mac) unless config.mac.nil?
env[:ui].info "Setting custom mac: #{config.mac}" unless config.mac.nil? || !config.networks.empty?
add_custom_mac(template, spec, config.mac) unless config.mac.nil? || !config.networks.empty?

# env[:ui].info "Setting custom vlan: #{config.vlan}" unless config.vlan.nil?
# add_custom_vlan(template, dc, spec, config.vlan) unless config.vlan.nil?
env[:ui].info "Setting custom vlan: #{config.vlan}" unless config.vlan.nil? || !config.networks.empty?
add_custom_vlan(template, dc, spec, config.vlan) unless config.vlan.nil? || !config.networks.empty?

env[:ui].info "Setting custom networks: #{config.networks}" unless config.networks.empty?
add_custom_networks(template, spec, config.networks) unless config.networks.empty?
Expand Down Expand Up @@ -283,7 +283,7 @@ def add_custom_networks(template, spec, networks)
adaptertype = net[:adaptertype] || ''
mac = net[:mac] || ''
if mac == ''
addresstype = net[:addresstype] || 'generated'
addresstype = 'generated'
else
addresstype = 'manual'
end
Expand Down