oscar 0.4.3 → 0.5.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.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +18 -0
  3. data/README.markdown +3 -20
  4. data/lib/oscar/command/init_vms.rb +2 -0
  5. data/lib/oscar/version.rb +1 -1
  6. data/oscar.gemspec +7 -7
  7. data/templates/oscar-init-skeleton/virtualbox/roles.yaml +10 -6
  8. data/templates/oscar-init-skeleton/vmware_fusion/roles.yaml +5 -6
  9. metadata +27 -26
  10. data/templates/oscar-init-skeleton/virtualbox/boxes.yaml +0 -12
  11. data/templates/oscar-init-skeleton/vmware_fusion/boxes.yaml +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 34a81f0f4cd4b615d7afbfdd14af71ba001b6c22
4
- data.tar.gz: 6868b54e7881112c175b84bea34a6e150924a193
3
+ metadata.gz: edaf490b259e77c6e4e9f8cb7464bfb55d36f6d0
4
+ data.tar.gz: da93197667e809171e77cf1640407e654329dc3d
5
5
  SHA512:
6
- metadata.gz: 7d3859566033c9cb0e65f6581f31017546e3273c45a605241203f8b1d60f1d1ba515658257022537c8a954e9fecf9002f91698ae7709e140837a0ffb9aa5ccec
7
- data.tar.gz: c875fc67cc4a2e053d6407b8a85bd46096732416915dfa6c88e17ac630762db100f999b99a68134f981262013118319c1800935ca74c2cdc93d910ccd328f503
6
+ metadata.gz: 32e1036d5c9eb83ff24c4d553fcec8e6e79a38a4959fb71630c445bac9dbebbd3e6618065e51fd4ed6e2b12303bfd4a3cec0fc92ef9ca7eb79c204b6524a0ef4
7
+ data.tar.gz: ed11027dcdf8bcf092b26ef481543cd098d8036f181f9fb1694b0973c54d25c1ad06efb5673b30b02fc15a71162d19fb2588b7c70cb54406ec52ededa9370845
data/CHANGELOG CHANGED
@@ -1,6 +1,24 @@
1
1
  CHANGELOG
2
2
  =========
3
3
 
4
+ 0.5.0
5
+ -----
6
+
7
+ 2016-03-28
8
+
9
+ This is a backwards-compatible update release with a few template cleanups.
10
+
11
+ * Update vagrant-hosts dependency to 2.x
12
+
13
+ * Update vagrant-pe_build dependency to 0.14.x
14
+
15
+ * Update vagrant-auto_network dependency to 1.x
16
+
17
+ * Update vagrant-config_builder dependency to 1.x
18
+
19
+ * (GH-49) Update the templates generated by `oscar init` and `oscar init-vms`
20
+
21
+
4
22
  0.4.3
5
23
  -----
6
24
 
data/README.markdown CHANGED
@@ -17,16 +17,10 @@ Initialize the base Oscar environment:
17
17
  Define a set of VMs:
18
18
 
19
19
  └> vagrant oscar init-vms \
20
- --master master=centos-64-x64-vbox4210-nocm \
21
- --agent first=centos-59-x64-vbox4210-nocm \
22
- --agent second=ubuntu-server-10044-x64-vbox4210-nocm
20
+ --master master=puppetlabs/centos-7.2-64-nocm \
21
+ --agent first=puppetlabs/centos-6.6-64-nocm \
22
+ --agent second=puppetlabs/ubuntu-14.04-64-nocm
23
23
  Your environment has been initialized with the following configuration:
24
- masters:
25
- - ["master", "centos-64-x64-vbox4210-nocm"]
26
- agents:
27
- - ["first", "centos-59-x64-vbox4210-nocm"]
28
- - ["second", "ubuntu-server-10044-x64-vbox4210-nocm"]
29
- pe_version: 3.0.1
30
24
 
31
25
  And build everything:
32
26
 
@@ -59,17 +53,6 @@ Oscar handles guest machine configuration with YAML.
59
53
 
60
54
  The default configuration looks something like this:
61
55
 
62
- ### `config/boxes.yaml`
63
-
64
- ---
65
- # Boxes from http://puppet-vagrant-boxes.puppetlabs.com/
66
- # Updated: 2013-08-08
67
- boxes:
68
- 'fedora-18-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box'
69
- 'centos-64-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
70
- 'centos-59-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box'
71
- [...]
72
-
73
56
  ### `config/roles.yaml`
74
57
 
75
58
  ---
data/lib/oscar/command/init_vms.rb CHANGED
@@ -43,11 +43,13 @@ class Oscar::Command::InitVMs < Vagrant.plugin('2', :command)
43
43
 
44
44
  o.on('-m', '--master=val', String, 'The name and basebox for a Puppet master') do |val|
45
45
  name, box = val.split('=')
46
+ box ||= 'puppetlabs/centos-7.2-64-nocm'
46
47
  @masters << [name, box]
47
48
  end
48
49
 
49
50
  o.on('-a', '--agent=val', String, 'The name and basebox for a Puppet agent') do |val|
50
51
  name, box = val.split('=')
52
+ box ||= 'puppetlabs/centos-7.2-64-nocm'
51
53
  @agents << [name, box]
52
54
  end
53
55
 
data/lib/oscar/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oscar
2
- VERSION = '0.4.3'
2
+ VERSION = '0.5.0'
3
3
  end
data/oscar.gemspec CHANGED
@@ -13,14 +13,14 @@ Gem::Specification.new do |gem|
13
13
  Puppet Enterprise.
14
14
  EOD
15
15
 
16
- gem.authors = 'Adrien Thebo'
17
- gem.email = 'adrien@somethingsinistral.net'
18
- gem.homepage = 'https://github.com/adrienthebo/oscar'
16
+ gem.authors = ['Adrien Thebo', 'Charlie Sharpsteen']
17
+ gem.email = ['adrien@somethingsinistral.net', 'source@sharpsteen.net']
18
+ gem.homepage = 'https://github.com/oscar-stack/oscar'
19
19
 
20
- gem.add_dependency 'vagrant-hosts', '~> 2.6.2'
21
- gem.add_dependency 'vagrant-pe_build', '~> 0.13.6'
22
- gem.add_dependency 'vagrant-auto_network', '~> 1.0.2'
23
- gem.add_dependency 'vagrant-config_builder', '~> 0.15.1'
20
+ gem.add_dependency 'vagrant-hosts', '~> 2.7'
21
+ gem.add_dependency 'vagrant-pe_build', '~> 0.14.0'
22
+ gem.add_dependency 'vagrant-auto_network', '~> 1.0'
23
+ gem.add_dependency 'vagrant-config_builder', '~> 1.0'
24
24
 
25
25
  gem.files = %x{git ls-files -z}.split("\0")
26
26
  gem.require_path = 'lib'
data/templates/oscar-init-skeleton/virtualbox/roles.yaml CHANGED
@@ -3,17 +3,21 @@ roles:
3
3
  pe-puppet-master:
4
4
  private_networks:
5
5
  - {ip: '0.0.0.0', auto_network: true}
6
- provider:
7
- type: virtualbox
8
- customize:
9
- - [modifyvm, !ruby/sym id, '--memory', 1024]
6
+ providers:
7
+ - type: virtualbox
8
+ linked_clone: true
9
+ customize:
10
+ - [modifyvm, !ruby/sym id, '--memory', 2048]
10
11
  provisioners:
11
- - {type: hosts}
12
+ - {type: hosts, sync_hosts: true}
12
13
  - {type: pe_bootstrap, role: !ruby/sym master}
13
14
 
14
15
  pe-puppet-agent:
15
16
  private_networks:
16
17
  - {ip: '0.0.0.0', auto_network: true}
18
+ providers:
19
+ - type: virtualbox
20
+ linked_clone: true
17
21
  provisioners:
18
- - {type: hosts}
22
+ - {type: hosts, sync_hosts: true}
19
23
  - {type: pe_bootstrap}
data/templates/oscar-init-skeleton/vmware_fusion/roles.yaml CHANGED
@@ -3,17 +3,16 @@ roles:
3
3
  pe-puppet-master:
4
4
  private_networks:
5
5
  - {ip: '0.0.0.0', auto_network: true}
6
- provider:
7
- type: vmware_fusion
8
- customize:
9
- - [modifyvm, !ruby/sym id, '--memory', 1024]
6
+ providers:
7
+ - type: vmware_fusion
8
+ vmx: { memsize: 2048 }
10
9
  provisioners:
11
- - {type: hosts}
10
+ - {type: hosts, sync_hosts: true}
12
11
  - {type: pe_bootstrap, role: !ruby/sym master}
13
12
 
14
13
  pe-puppet-agent:
15
14
  private_networks:
16
15
  - {ip: '0.0.0.0', auto_network: true}
17
16
  provisioners:
18
- - {type: hosts}
17
+ - {type: hosts, sync_hosts: true}
19
18
  - {type: pe_bootstrap}
metadata CHANGED
@@ -1,81 +1,84 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oscar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.3
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrien Thebo
8
+ - Charlie Sharpsteen
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2016-01-17 00:00:00.000000000 Z
12
+ date: 2016-03-28 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: vagrant-hosts
15
16
  requirement: !ruby/object:Gem::Requirement
16
17
  requirements:
17
- - - ~>
18
+ - - "~>"
18
19
  - !ruby/object:Gem::Version
19
- version: 2.6.2
20
+ version: '2.7'
20
21
  type: :runtime
21
22
  prerelease: false
22
23
  version_requirements: !ruby/object:Gem::Requirement
23
24
  requirements:
24
- - - ~>
25
+ - - "~>"
25
26
  - !ruby/object:Gem::Version
26
- version: 2.6.2
27
+ version: '2.7'
27
28
  - !ruby/object:Gem::Dependency
28
29
  name: vagrant-pe_build
29
30
  requirement: !ruby/object:Gem::Requirement
30
31
  requirements:
31
- - - ~>
32
+ - - "~>"
32
33
  - !ruby/object:Gem::Version
33
- version: 0.13.6
34
+ version: 0.14.0
34
35
  type: :runtime
35
36
  prerelease: false
36
37
  version_requirements: !ruby/object:Gem::Requirement
37
38
  requirements:
38
- - - ~>
39
+ - - "~>"
39
40
  - !ruby/object:Gem::Version
40
- version: 0.13.6
41
+ version: 0.14.0
41
42
  - !ruby/object:Gem::Dependency
42
43
  name: vagrant-auto_network
43
44
  requirement: !ruby/object:Gem::Requirement
44
45
  requirements:
45
- - - ~>
46
+ - - "~>"
46
47
  - !ruby/object:Gem::Version
47
- version: 1.0.2
48
+ version: '1.0'
48
49
  type: :runtime
49
50
  prerelease: false
50
51
  version_requirements: !ruby/object:Gem::Requirement
51
52
  requirements:
52
- - - ~>
53
+ - - "~>"
53
54
  - !ruby/object:Gem::Version
54
- version: 1.0.2
55
+ version: '1.0'
55
56
  - !ruby/object:Gem::Dependency
56
57
  name: vagrant-config_builder
57
58
  requirement: !ruby/object:Gem::Requirement
58
59
  requirements:
59
- - - ~>
60
+ - - "~>"
60
61
  - !ruby/object:Gem::Version
61
- version: 0.15.1
62
+ version: '1.0'
62
63
  type: :runtime
63
64
  prerelease: false
64
65
  version_requirements: !ruby/object:Gem::Requirement
65
66
  requirements:
66
- - - ~>
67
+ - - "~>"
67
68
  - !ruby/object:Gem::Version
68
- version: 0.15.1
69
+ version: '1.0'
69
70
  description: |2
70
71
  Oscar is a series of extensions to simplify building out a Puppet Enterprise
71
72
  environment. It handles networking configuration and fetching/installing
72
73
  Puppet Enterprise.
73
- email: adrien@somethingsinistral.net
74
+ email:
75
+ - adrien@somethingsinistral.net
76
+ - source@sharpsteen.net
74
77
  executables: []
75
78
  extensions: []
76
79
  extra_rdoc_files: []
77
80
  files:
78
- - .gitignore
81
+ - ".gitignore"
79
82
  - CHANGELOG
80
83
  - Gemfile
81
84
  - LICENSE
@@ -92,11 +95,9 @@ files:
92
95
  - oscar.gemspec
93
96
  - templates/locales/en.yml
94
97
  - templates/oscar-init-skeleton/Vagrantfile
95
- - templates/oscar-init-skeleton/virtualbox/boxes.yaml
96
98
  - templates/oscar-init-skeleton/virtualbox/roles.yaml
97
- - templates/oscar-init-skeleton/vmware_fusion/boxes.yaml
98
99
  - templates/oscar-init-skeleton/vmware_fusion/roles.yaml
99
- homepage: https://github.com/adrienthebo/oscar
100
+ homepage: https://github.com/oscar-stack/oscar
100
101
  licenses:
101
102
  - Apache 2.0
102
103
  metadata: {}
@@ -106,17 +107,17 @@ require_paths:
106
107
  - lib
107
108
  required_ruby_version: !ruby/object:Gem::Requirement
108
109
  requirements:
109
- - - '>='
110
+ - - ">="
110
111
  - !ruby/object:Gem::Version
111
112
  version: '0'
112
113
  required_rubygems_version: !ruby/object:Gem::Requirement
113
114
  requirements:
114
- - - '>='
115
+ - - ">="
115
116
  - !ruby/object:Gem::Version
116
117
  version: '0'
117
118
  requirements: []
118
119
  rubyforge_project:
119
- rubygems_version: 2.0.14
120
+ rubygems_version: 2.4.5.1
120
121
  signing_key:
121
122
  specification_version: 4
122
123
  summary: Easy mode Puppet Enterprise provisioning
data/templates/oscar-init-skeleton/virtualbox/boxes.yaml DELETED
@@ -1,12 +0,0 @@
1
- ---
2
- # Boxes from http://puppet-vagrant-boxes.puppetlabs.com/
3
- # Updated: 2013-08-08
4
- boxes:
5
- 'fedora-18-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box'
6
- 'centos-64-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
7
- 'centos-59-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box'
8
- 'debian-607-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box'
9
- 'debian-70rc1-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box'
10
- 'sles-11sp1-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box'
11
- 'ubuntu-server-10044-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box'
12
- 'ubuntu-server-12042-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box'
data/templates/oscar-init-skeleton/vmware_fusion/boxes.yaml DELETED
@@ -1,10 +0,0 @@
1
- ---
2
- # Boxes from http://puppet-vagrant-boxes.puppetlabs.com/
3
- # Updated: 2014-09-16
4
- boxes:
5
- 'fedora-18-x64-vf503-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vf503-nocm.box'
6
- 'centos-64-x64-fusion503-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box'
7
- 'debian-607-x64-vf503-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vf503-nocm.box'
8
- 'debian-70rc1-x64-vf503-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vf503-nocm.box'
9
- 'ubuntu-server-10044-x64-fusion503-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-fusion503-nocm.box'
10
- 'ubuntu-svr-12042-x64-vf503-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-svr-12042-x64-vf503-nocm.box'