vagrant-unbundled 2.2.8.0 → 2.2.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/lib/vagrant/bundler.rb +5 -5
- data/lib/vagrant/errors.rb +4 -0
- data/lib/vagrant/plugin/manager.rb +21 -10
- data/plugins/provisioners/docker/plugin.rb +2 -2
- data/plugins/provisioners/podman/cap/centos/podman_install.rb +35 -0
- data/plugins/provisioners/podman/cap/redhat/podman_install.rb +10 -19
- data/plugins/provisioners/podman/plugin.rb +5 -0
- data/templates/locales/en.yml +4 -0
- data/version.txt +1 -1
- metadata +35 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fc8998228365e044e5c4dae334de559593ead91cec2b40a2fb4b659068de08ed
|
|
4
|
+
data.tar.gz: a1c1681b1fcea9ad3079a71ce3a36ff13a950149d997ccb110c95bec92c7a329
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 46388919cbbee6ce29ad5a4590ca652736076d1f951d50574ff66babd15acb22829db1e61a4bae7962af5734d27e7fbbc6c8262fc62ac147ac5d0736e560051b
|
|
7
|
+
data.tar.gz: 6ceff4e11163fe20e30415a9582c34a94b8241603c0807cc9a8cd10209fc9904ce7cd79f6ae66a2e238d179d90aef071b894792e649d8223f327b511d2c735f3
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
## 2.2.9 (May 07, 2020)
|
|
2
|
+
|
|
3
|
+
BUG FIXES:
|
|
4
|
+
|
|
5
|
+
- core/bundler: Properly handle plugin install with available specification [GH-11592]
|
|
6
|
+
- provisioners/docker: Fix CentOS docker install and start service capabilities [GH-11581]
|
|
7
|
+
- provisioners/podman: Seperate RHEL install from CentOS install [GH-11584]
|
|
8
|
+
|
|
1
9
|
## 2.2.8 (May 04, 2020)
|
|
2
10
|
|
|
3
11
|
FEATURES:
|
data/lib/vagrant/bundler.rb
CHANGED
|
@@ -480,7 +480,7 @@ module Vagrant
|
|
|
480
480
|
if update[:gems] == true || (update[:gems].respond_to?(:include?) && update[:gems].include?(name))
|
|
481
481
|
if Gem::Requirement.new(gem_version).exact?
|
|
482
482
|
gem_version = "> 0"
|
|
483
|
-
@logger.debug("Detected exact version match for `#{name}` plugin update. Reset to
|
|
483
|
+
@logger.debug("Detected exact version match for `#{name}` plugin update. Reset to loosen constraint #{gem_version.inspect}.")
|
|
484
484
|
end
|
|
485
485
|
skips << name
|
|
486
486
|
end
|
|
@@ -565,10 +565,10 @@ module Vagrant
|
|
|
565
565
|
activate_solution(solution)
|
|
566
566
|
|
|
567
567
|
# Remove gems which are already installed
|
|
568
|
-
request_set.sorted_requests.delete_if do |
|
|
569
|
-
|
|
570
|
-
if vagrant_internal_specs.detect{|
|
|
571
|
-
@logger.debug("Removing activation request from install. Already installed. (#{
|
|
568
|
+
request_set.sorted_requests.delete_if do |act_req|
|
|
569
|
+
rs = act_req.spec
|
|
570
|
+
if vagrant_internal_specs.detect{ |i| i.name == rs.name && i.version == rs.version }
|
|
571
|
+
@logger.debug("Removing activation request from install. Already installed. (#{rs.spec.full_name})")
|
|
572
572
|
true
|
|
573
573
|
end
|
|
574
574
|
end
|
data/lib/vagrant/errors.rb
CHANGED
|
@@ -628,6 +628,10 @@ module Vagrant
|
|
|
628
628
|
error_key(:plugin_install_license_not_found)
|
|
629
629
|
end
|
|
630
630
|
|
|
631
|
+
class PluginInstallFailed < VagrantError
|
|
632
|
+
error_key(:plugin_install_failed)
|
|
633
|
+
end
|
|
634
|
+
|
|
631
635
|
class PluginInstallSpace < VagrantError
|
|
632
636
|
error_key(:plugin_install_space)
|
|
633
637
|
end
|
|
@@ -150,17 +150,28 @@ module Vagrant
|
|
|
150
150
|
else
|
|
151
151
|
result = local_spec
|
|
152
152
|
end
|
|
153
|
-
# Add the plugin to the state file
|
|
154
|
-
plugin_file = opts[:env_local] ? @local_file : @user_file
|
|
155
|
-
plugin_file.add_plugin(
|
|
156
|
-
result.name,
|
|
157
|
-
version: opts[:version],
|
|
158
|
-
require: opts[:require],
|
|
159
|
-
sources: opts[:sources],
|
|
160
|
-
env_local: !!opts[:env_local],
|
|
161
|
-
installed_gem_version: result.version.to_s
|
|
162
|
-
)
|
|
163
153
|
|
|
154
|
+
if result
|
|
155
|
+
# Add the plugin to the state file
|
|
156
|
+
plugin_file = opts[:env_local] ? @local_file : @user_file
|
|
157
|
+
plugin_file.add_plugin(
|
|
158
|
+
result.name,
|
|
159
|
+
version: opts[:version],
|
|
160
|
+
require: opts[:require],
|
|
161
|
+
sources: opts[:sources],
|
|
162
|
+
env_local: !!opts[:env_local],
|
|
163
|
+
installed_gem_version: result.version.to_s
|
|
164
|
+
)
|
|
165
|
+
else
|
|
166
|
+
r = Gem::Dependency.new(name, opts[:version])
|
|
167
|
+
result = Gem::Specification.find { |s|
|
|
168
|
+
s.satisfies_requirement?(r) &&
|
|
169
|
+
s.activated?
|
|
170
|
+
}
|
|
171
|
+
raise Errors::PluginInstallFailed,
|
|
172
|
+
name: name if result.nil?
|
|
173
|
+
@logger.warn("Plugin install returned no result as no new plugins were installed.")
|
|
174
|
+
end
|
|
164
175
|
# After install clean plugin gems to remove any cruft. This is useful
|
|
165
176
|
# for removing outdated dependencies or other versions of an installed
|
|
166
177
|
# plugin if the plugin is upgraded/downgraded
|
|
@@ -30,12 +30,12 @@ module VagrantPlugins
|
|
|
30
30
|
end
|
|
31
31
|
|
|
32
32
|
guest_capability("centos", "docker_install") do
|
|
33
|
-
require_relative "cap/
|
|
33
|
+
require_relative "cap/centos/docker_install"
|
|
34
34
|
Cap::Centos::DockerInstall
|
|
35
35
|
end
|
|
36
36
|
|
|
37
37
|
guest_capability("centos", "docker_start_service") do
|
|
38
|
-
require_relative "cap/
|
|
38
|
+
require_relative "cap/centos/docker_start_service"
|
|
39
39
|
Cap::Centos::DockerStartService
|
|
40
40
|
end
|
|
41
41
|
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
module VagrantPlugins
|
|
2
|
+
module PodmanProvisioner
|
|
3
|
+
module Cap
|
|
4
|
+
module Centos
|
|
5
|
+
module PodmanInstall
|
|
6
|
+
def self.podman_install(machine, kubic)
|
|
7
|
+
if kubic
|
|
8
|
+
# Official install instructions for podman
|
|
9
|
+
# https://podman.io/getting-started/installation.html
|
|
10
|
+
case machine.guest.capability("flavor")
|
|
11
|
+
when :centos_7
|
|
12
|
+
machine.communicate.tap do |comm|
|
|
13
|
+
comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_7/devel:kubic:libcontainers:stable.repo")
|
|
14
|
+
comm.sudo("yum -q -y install podman")
|
|
15
|
+
end
|
|
16
|
+
when :centos_8
|
|
17
|
+
machine.communicate.tap do |comm|
|
|
18
|
+
comm.sudo("dnf -y module disable container-tools &> /dev/null || echo 'container-tools module does not exist'")
|
|
19
|
+
comm.sudo("dnf -y install 'dnf-command(copr)'")
|
|
20
|
+
comm.sudo("dnf -y copr enable rhcontainerbot/container-selinux")
|
|
21
|
+
comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo")
|
|
22
|
+
comm.sudo("dnf -y install podman")
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
else
|
|
26
|
+
machine.communicate.tap do |comm|
|
|
27
|
+
comm.sudo("yum -q -y install podman")
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
end
|
|
34
|
+
end
|
|
35
|
+
end
|
|
@@ -4,28 +4,19 @@ module VagrantPlugins
|
|
|
4
4
|
module Redhat
|
|
5
5
|
module PodmanInstall
|
|
6
6
|
def self.podman_install(machine, kubic)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
when :rhel_7
|
|
12
|
-
machine.communicate.tap do |comm|
|
|
13
|
-
comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_7/devel:kubic:libcontainers:stable.repo")
|
|
14
|
-
comm.sudo("yum -q -y install podman")
|
|
15
|
-
end
|
|
16
|
-
when :rhel_8
|
|
17
|
-
machine.communicate.tap do |comm|
|
|
18
|
-
comm.sudo("dnf -y module disable container-tools")
|
|
19
|
-
comm.sudo("dnf -y install 'dnf-command(copr)'")
|
|
20
|
-
comm.sudo("dnf -y copr enable rhcontainerbot/container-selinux")
|
|
21
|
-
comm.sudo("curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo")
|
|
22
|
-
comm.sudo("dnf -y install podman")
|
|
23
|
-
end
|
|
24
|
-
end
|
|
25
|
-
else
|
|
7
|
+
# Official install instructions for podman
|
|
8
|
+
# https://podman.io/getting-started/installation.html
|
|
9
|
+
case machine.guest.capability("flavor")
|
|
10
|
+
when :rhel_7
|
|
26
11
|
machine.communicate.tap do |comm|
|
|
12
|
+
comm.sudo("subscription-manager repos --enable=rhel-7-server-extras-rpms")
|
|
27
13
|
comm.sudo("yum -q -y install podman")
|
|
28
14
|
end
|
|
15
|
+
when :rhel_8
|
|
16
|
+
machine.communicate.tap do |comm|
|
|
17
|
+
comm.sudo("yum module enable -y container-tools")
|
|
18
|
+
comm.sudo("yum module install -y container-tools")
|
|
19
|
+
end
|
|
29
20
|
end
|
|
30
21
|
end
|
|
31
22
|
end
|
|
@@ -19,6 +19,11 @@ module VagrantPlugins
|
|
|
19
19
|
Cap::Redhat::PodmanInstall
|
|
20
20
|
end
|
|
21
21
|
|
|
22
|
+
guest_capability("centos", "podman_install") do
|
|
23
|
+
require_relative "cap/centos/podman_install"
|
|
24
|
+
Cap::Centos::PodmanInstall
|
|
25
|
+
end
|
|
26
|
+
|
|
22
27
|
guest_capability("linux", "podman_installed") do
|
|
23
28
|
require_relative "cap/linux/podman_installed"
|
|
24
29
|
Cap::Linux::PodmanInstalled
|
data/templates/locales/en.yml
CHANGED
|
@@ -1130,6 +1130,10 @@ en:
|
|
|
1130
1130
|
The license file to install could not be found. Please verify
|
|
1131
1131
|
the path you gave is correct. The path to the license file given
|
|
1132
1132
|
was: '%{path}'
|
|
1133
|
+
plugin_install_failed: |-
|
|
1134
|
+
Vagrant was unable to install the requested plugin: '%{name}'
|
|
1135
|
+
Please try to install this plugin again. If Vagrant is still unable
|
|
1136
|
+
to install the requested plugin, please report this error.
|
|
1133
1137
|
plugin_install_space: |-
|
|
1134
1138
|
The directory where plugins are installed (the Vagrant home directory)
|
|
1135
1139
|
has a space in it. On Windows, there is a bug in Ruby when compiling
|
data/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.2.
|
|
1
|
+
2.2.9.0
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-unbundled
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.9.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mitchell Hashimoto
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2020-
|
|
12
|
+
date: 2020-06-01 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: bcrypt_pbkdf
|
|
@@ -1288,6 +1288,7 @@ files:
|
|
|
1288
1288
|
- plugins/provisioners/file/config.rb
|
|
1289
1289
|
- plugins/provisioners/file/plugin.rb
|
|
1290
1290
|
- plugins/provisioners/file/provisioner.rb
|
|
1291
|
+
- plugins/provisioners/podman/cap/centos/podman_install.rb
|
|
1291
1292
|
- plugins/provisioners/podman/cap/linux/podman_installed.rb
|
|
1292
1293
|
- plugins/provisioners/podman/cap/redhat/podman_install.rb
|
|
1293
1294
|
- plugins/provisioners/podman/client.rb
|
|
@@ -3816,6 +3817,37 @@ files:
|
|
|
3816
3817
|
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0425/types/text.yaml
|
|
3817
3818
|
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0425/types/video.yaml
|
|
3818
3819
|
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0425/types/world.yaml
|
|
3820
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/Code-of-Conduct.md
|
|
3821
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/Contributing.md
|
|
3822
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/History.md
|
|
3823
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/Licence.md
|
|
3824
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/Manifest.txt
|
|
3825
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/README.md
|
|
3826
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/Rakefile
|
|
3827
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime-types.json
|
|
3828
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.content_type.column
|
|
3829
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.docs.column
|
|
3830
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.encoding.column
|
|
3831
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.flags.column
|
|
3832
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.friendly.column
|
|
3833
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.pext.column
|
|
3834
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.use_instead.column
|
|
3835
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/data/mime.xrefs.column
|
|
3836
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/lib/mime-types-data.rb
|
|
3837
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/lib/mime/types/data.rb
|
|
3838
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/application.yaml
|
|
3839
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/audio.yaml
|
|
3840
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/chemical.yaml
|
|
3841
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/conference.yaml
|
|
3842
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/drawing.yaml
|
|
3843
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/font.yaml
|
|
3844
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/image.yaml
|
|
3845
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/message.yaml
|
|
3846
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/model.yaml
|
|
3847
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/multipart.yaml
|
|
3848
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/text.yaml
|
|
3849
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/video.yaml
|
|
3850
|
+
- vendor/bundle/ruby/2.7.0/gems/mime-types-data-3.2020.0512/types/world.yaml
|
|
3819
3851
|
- vendor/bundle/ruby/2.7.0/gems/multi_json-1.14.1/CHANGELOG.md
|
|
3820
3852
|
- vendor/bundle/ruby/2.7.0/gems/multi_json-1.14.1/CONTRIBUTING.md
|
|
3821
3853
|
- vendor/bundle/ruby/2.7.0/gems/multi_json-1.14.1/LICENSE.md
|
|
@@ -5103,6 +5135,7 @@ files:
|
|
|
5103
5135
|
- vendor/bundle/ruby/2.7.0/specifications/logging-2.2.2.gemspec
|
|
5104
5136
|
- vendor/bundle/ruby/2.7.0/specifications/mime-types-3.3.1.gemspec
|
|
5105
5137
|
- vendor/bundle/ruby/2.7.0/specifications/mime-types-data-3.2020.0425.gemspec
|
|
5138
|
+
- vendor/bundle/ruby/2.7.0/specifications/mime-types-data-3.2020.0512.gemspec
|
|
5106
5139
|
- vendor/bundle/ruby/2.7.0/specifications/multi_json-1.14.1.gemspec
|
|
5107
5140
|
- vendor/bundle/ruby/2.7.0/specifications/net-scp-1.2.1.gemspec
|
|
5108
5141
|
- vendor/bundle/ruby/2.7.0/specifications/net-sftp-2.1.2.gemspec
|