vagrant-zones 0.1.62 → 0.1.64
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +17 -0
- data/lib/vagrant-zones/driver.rb +5 -7
- data/lib/vagrant-zones/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 722ca0c9fbda727beb0e393ff921a5cafe3832b4fc7568eb8a564211c924867c
|
4
|
+
data.tar.gz: 9f6161e8374c34eef8f13423d8534849c4d7c4a501532a7e9384de1f6bdbdccf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a3278978e49ac636071914cd2a5d7e231fd702a6e35c1cbdc7ee25d07d2463ba1c9b41dbd61c1e985b23b5eb87d5c5c677158bd0335d4118b9aa016b8615f447
|
7
|
+
data.tar.gz: ec604b4e5a76ea6f2ee4b26e4207c9d0698940a54dd89f3b1b6faa30917fe7bf745bab0c362b9d9d644a297d062d18b45d874bedef3641e2e43842edb3930a45
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,22 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## [0.1.64](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.63...v0.1.64) (2023-01-06)
|
4
|
+
|
5
|
+
|
6
|
+
### Bug Fixes
|
7
|
+
|
8
|
+
* vtype ([3169e95](https://github.com/STARTcloud/vagrant-zones/commit/3169e95d23141272a6d3e1dbd9acbaddc0ddeac8))
|
9
|
+
|
10
|
+
## [0.1.63](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.62...v0.1.63) (2023-01-06)
|
11
|
+
|
12
|
+
|
13
|
+
### Bug Fixes
|
14
|
+
|
15
|
+
* fubylint ([bcb4e5b](https://github.com/STARTcloud/vagrant-zones/commit/bcb4e5bf6a1a74e773c0757f19531bd739b83676))
|
16
|
+
* get_ipaddress ([4d59a77](https://github.com/STARTcloud/vagrant-zones/commit/4d59a77c7b837259d2c843ddfff81a0442a62f6e))
|
17
|
+
* get_ipaddress ([267aea5](https://github.com/STARTcloud/vagrant-zones/commit/267aea5f96be8ed443e5dbe8751fe0e3f7a54261))
|
18
|
+
* ruby lint ([4b82529](https://github.com/STARTcloud/vagrant-zones/commit/4b82529df3e2d76f60e7f480c3226a3667081117))
|
19
|
+
|
3
20
|
## [0.1.62](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.61...v0.1.62) (2023-01-06)
|
4
21
|
|
5
22
|
|
data/lib/vagrant-zones/driver.rb
CHANGED
@@ -98,7 +98,7 @@ module VagrantPlugins
|
|
98
98
|
## Run commands over SSH instead of ZLogin
|
99
99
|
def ssh_run_command(uii, command)
|
100
100
|
config = @machine.provider_config
|
101
|
-
ip = get_ip_address(
|
101
|
+
ip = get_ip_address('runsshcommmand')
|
102
102
|
user = user(@machine)
|
103
103
|
key = userprivatekeypath(@machine).to_s
|
104
104
|
port = sshport(@machine).to_s
|
@@ -177,9 +177,7 @@ module VagrantPlugins
|
|
177
177
|
end
|
178
178
|
|
179
179
|
# This filters the VM usage for VNIC Naming Purposes
|
180
|
-
def vtype(
|
181
|
-
config = @machine.provider_config
|
182
|
-
uii.info(I18n.t('vagrant_zones.vtype')) if config.debug
|
180
|
+
def vtype(config)
|
183
181
|
case config.vm_type
|
184
182
|
when /template/
|
185
183
|
'1'
|
@@ -254,20 +252,20 @@ module VagrantPlugins
|
|
254
252
|
# This Sanitizes the VNIC Name
|
255
253
|
def vname(uii, opts)
|
256
254
|
config = @machine.provider_config
|
257
|
-
vnic_name = "vnic#{nictype(opts)}#{vtype(
|
255
|
+
vnic_name = "vnic#{nictype(opts)}#{vtype(config)}_#{config.partition_id}_#{opts[:nic_number]}"
|
258
256
|
uii.info(I18n.t('vagrant_zones.vnic_name') + vnic_name) if config.debug
|
259
257
|
vnic_name
|
260
258
|
end
|
261
259
|
|
262
260
|
## If DHCP and Zlogin, get the IP address
|
263
|
-
def get_ip_address(
|
261
|
+
def get_ip_address(_function)
|
264
262
|
config = @machine.provider_config
|
265
263
|
name = @machine.name
|
266
264
|
@machine.config.vm.networks.each do |_adaptertype, opts|
|
267
265
|
responses = []
|
268
266
|
nic_type = nictype(opts)
|
269
267
|
if opts[:dhcp4] && opts[:managed]
|
270
|
-
vnic_name = "vnic#{nic_type}#{vtype(
|
268
|
+
vnic_name = "vnic#{nic_type}#{vtype(config)}_#{config.partition_id}_#{opts[:nic_number]}"
|
271
269
|
PTY.spawn("pfexec zlogin -C #{name}") do |zlogin_read, zlogin_write, pid|
|
272
270
|
command = "ip -4 addr show dev #{vnic_name} | head -n -1 | tail -1 | awk '{ print $2 }' | cut -f1 -d\"/\" \n"
|
273
271
|
zlogin_read.expect(/\n/) { zlogin_write.printf(command) }
|