vagrant-ovirt3 1.0.0 → 1.1.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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 10423f44983ce1e613d1ff08ea44fccbe0693ab1
4
- data.tar.gz: 11d9e3f5839ab31db9081fa4c1779054ddd91a0e
3
+ metadata.gz: ddd52b02229c6bb338aef3e417822726240e9678
4
+ data.tar.gz: 6dfeed04fbc9dbdc7f8979369d1d9b86d3a87e40
5
5
  SHA512:
6
- metadata.gz: fcf97503453de8e5647540903cf3e173d7a072b901bc771c288b5230f0e0cda0d124129a9f471e9e5fae77ae8ddcdecf52855018065c0837d898d536bd574ffd
7
- data.tar.gz: 477d34d88e332da8034ec5127291b1ce0ba54c03219d1f246f45801406823bb9a60a7ba7765dbd776a335d60f23f853975f59533ba430d63fdfe56fa70382d47
6
+ metadata.gz: f1a453dacf2025582d4685d8fce3d2f0a26fcbfed3f9e3d1d301e47ad84bfc77b31e978bec55384463012d41c9b815fea46517bf0129aa31bd9f52502a56cd76
7
+ data.tar.gz: 0980a6a92f18b5427d7535ca76077673850f2a26d1f2ed30e58788e5d6fc7ab5c3a4ee3266640e6ef442f68ba9f0160d69dbd2a199e49b0909367842c0abec14
data/README.md CHANGED
@@ -78,6 +78,7 @@ This provider exposes quite a few provider-specific configuration options:
78
78
  * `password` - Password to access oVirt.
79
79
  * `datacenter` - oVirt datacenter name, where machines will be created.
80
80
  * `cluster` - oVirt cluster name. Defaults to first cluster found.
81
+ * `ca_no_verify` - Set to `true` to not verify TLS certificates.
81
82
 
82
83
  ### Domain Specific Options
83
84
 
@@ -32,11 +32,3 @@ module VagrantPlugins
32
32
  end
33
33
  end
34
34
  end
35
-
36
- # Set default provider with bash environment variable like this:
37
- # export VAGRANT_DEFAULT_PROVIDER=ovirt3
38
- Vagrant::Environment.class_eval do
39
- def default_provider
40
- (ENV['VAGRANT_DEFAULT_PROVIDER'] || :virtualbox).to_sym
41
- end
42
- end
@@ -33,6 +33,7 @@ module VagrantPlugins
33
33
  conn_attr[:ovirt_url] = "#{config.url}/api"
34
34
  conn_attr[:ovirt_username] = config.username if config.username
35
35
  conn_attr[:ovirt_password] = config.password if config.password
36
+ conn_attr[:ovirt_ca_no_verify] = config.ca_no_verify if config.ca_no_verify
36
37
 
37
38
  # We need datacenter id in fog connection initialization. But it's
38
39
  # much simpler to use datacenter name in Vagrantfile. So get
@@ -74,7 +75,8 @@ module VagrantPlugins
74
75
  credentials[:ovirt_username],
75
76
  credentials[:ovirt_password],
76
77
  credentials[:ovirt_url],
77
- credentials[:ovirt_datacenter],
78
+ { :datacenter_id => credentials[:ovirt_datacenter],
79
+ :ca_no_verify => credentials[:ovirt_ca_no_verify] }
78
80
  )
79
81
  end
80
82
  end
@@ -18,6 +18,7 @@ module VagrantPlugins
18
18
  ssh_info = env[:machine].ssh_info
19
19
 
20
20
  env[:machine].config.vm.synced_folders.each do |id, data|
21
+ next if data[:disabled]
21
22
  hostpath = File.expand_path(data[:hostpath], env[:root_path])
22
23
  guestpath = data[:guestpath]
23
24
 
@@ -30,6 +30,8 @@ module VagrantPlugins
30
30
  @template = UNSET_VALUE
31
31
  @console = UNSET_VALUE
32
32
  @disk_size = UNSET_VALUE
33
+
34
+ @ca_no_verify = UNSET_VALUE
33
35
  end
34
36
 
35
37
  def finalize!
@@ -45,6 +47,8 @@ module VagrantPlugins
45
47
  @template = 'Blank' if @template == UNSET_VALUE
46
48
  @console = 'spice' if @console == UNSET_VALUE
47
49
  @disk_size = nil if @disk_size == UNSET_VALUE
50
+
51
+ @ca_no_verify = false if @ca_no_verify == UNSET_VALUE
48
52
  end
49
53
 
50
54
  def validate(machine)
@@ -1,6 +1,6 @@
1
1
  module VagrantPlugins
2
2
  module OVirtProvider
3
- VERSION = '1.0.0'
3
+ VERSION = '1.1.0'
4
4
  end
5
5
  end
6
6
 
@@ -46,7 +46,7 @@ elif [[ $RHEL_MAJOR_VERSION -eq 6 ]]; then
46
46
  https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
47
47
  elif [[ $RHEL_MAJOR_VERSION -eq 7 ]]; then
48
48
  yum install -y \
49
- http://ftp.astral.ro/mirrors/fedora/pub/epel/7/x86_64/e/epel-release-7-2.noarch.rpm \
49
+ http://ftp.astral.ro/mirrors/fedora/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm \
50
50
  https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
51
51
  else
52
52
  echo "Is this a valid major release?"
@@ -16,9 +16,8 @@ Gem::Specification.new do |gem|
16
16
  gem.require_paths = ["lib"]
17
17
  gem.version = VagrantPlugins::OVirtProvider::VERSION
18
18
 
19
- gem.add_runtime_dependency "fog", "~> 1.25"
20
- gem.add_runtime_dependency 'rbovirt', '~> 0.0', '>= 0.0.30'
21
-
19
+ gem.add_runtime_dependency "fog", "~> 1.27"
20
+ gem.add_runtime_dependency 'rbovirt', '~> 0.0', '>= 0.0.31'
22
21
 
23
22
  gem.add_development_dependency 'rake', '~> 0'
24
23
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-ovirt3
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marcus Young
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-18 00:00:00.000000000 Z
11
+ date: 2015-01-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fog
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.25'
19
+ version: '1.27'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.25'
26
+ version: '1.27'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rbovirt
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
33
33
  version: '0.0'
34
34
  - - ">="
35
35
  - !ruby/object:Gem::Version
36
- version: 0.0.30
36
+ version: 0.0.31
37
37
  type: :runtime
38
38
  prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '0.0'
44
44
  - - ">="
45
45
  - !ruby/object:Gem::Version
46
- version: 0.0.30
46
+ version: 0.0.31
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
49
  requirement: !ruby/object:Gem::Requirement