oscar 0.2.0alpha3 → 0.2.0alpha4

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.
@@ -21,7 +21,14 @@ class Oscar::Environment
21
21
  @nodes << node
22
22
  end
23
23
 
24
+ pe_build_options = @config.data["provisioners"].find do |hash|
25
+ hash["name"] == "pe_build"
26
+ end
27
+
24
28
  Vagrant::Config.run do |config|
29
+ config.pe_build.download_root = pe_build_options["options"]["download_root"]
30
+ config.pe_build.version = pe_build_options["options"]["version"]
31
+ config.pe_build.filename = pe_build_options["options"]["filename"]
25
32
  @nodes.each { |node| node.define(config) }
26
33
  end
27
34
  end
@@ -30,7 +30,7 @@ class Oscar::Networking
30
30
  arr = []
31
31
 
32
32
  arr << ['127.0.0.1', ['localhost']]
33
- arr << ['127.0.1.1', ["#{node.name}.#{@domainname}", node.name]]
33
+ arr << ['127.0.1.1', [node.name]]
34
34
 
35
35
  @nodes.each_pair { |address, n| arr << [address, [n.name, "#{n.name}.#{@domainname}"]] }
36
36
 
@@ -62,6 +62,18 @@ mapping:
62
62
  name: { required: true }
63
63
  "forwards": *forwards
64
64
 
65
+ "provisioners":
66
+ desc: "bla bla bla"
67
+ type: seq
68
+ sequence:
69
+ -
70
+ type: map
71
+ mapping:
72
+ "name":
73
+ required: true
74
+ "options":
75
+ type: any
76
+
65
77
  # Network configuration for oscar, not applicable to any node.
66
78
  "networking":
67
79
  type: map
data/lib/oscar/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oscar
2
- VERSION = '0.2.0alpha3'
2
+ VERSION = '0.2.0alpha4'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oscar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0alpha3
4
+ version: 0.2.0alpha4
5
5
  prerelease: 5
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-20 00:00:00.000000000 Z
12
+ date: 2013-01-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: vagrant
@@ -104,15 +104,8 @@ files:
104
104
  - Gemfile
105
105
  - LICENSE
106
106
  - README.markdown
107
- - Vagrantfile
108
107
  - config/.gitignore
109
108
  - config/roles.yaml.dist
110
- - doc/answers/README.markdown
111
- - doc/answers/agent.txt
112
- - doc/answers/master-1.1.txt
113
- - doc/answers/master-2.0.0.txt
114
- - doc/answers/master-2.5.0.txt
115
- - doc/answers/master-db.txt
116
109
  - lib/oscar.rb
117
110
  - lib/oscar/config.rb
118
111
  - lib/oscar/environment.rb
@@ -122,8 +115,6 @@ files:
122
115
  - lib/oscar/version.rb
123
116
  - lib/vagrant_init.rb
124
117
  - oscar.gemspec
125
- - templates/answers/agent.txt.erb
126
- - templates/answers/master.txt.erb
127
118
  homepage: https://github.com/adrienthebo/oscar
128
119
  licenses: []
129
120
  post_install_message:
data/Vagrantfile DELETED
@@ -1,5 +0,0 @@
1
- # lol shim
2
- $LOAD_PATH << "#{File.dirname(__FILE__)}/lib"
3
- require 'oscar'
4
-
5
- Oscar.load! File.dirname(__FILE__)
@@ -1 +0,0 @@
1
- These are reference answers files for the various versions of PE.
@@ -1,10 +0,0 @@
1
- q_install=y
2
- q_puppet_cloud_install=n
3
- q_puppet_enterpriseconsole_install=n
4
- q_puppet_symlinks_install=y
5
- q_puppetagent_certname=$(hostname -s)
6
- q_puppetagent_install=y
7
- q_puppetagent_server=master
8
- q_puppetmaster_install=n
9
- q_vendor_packages_install=y
10
- q_continue_or_reenter_master_hostname=c
@@ -1,22 +0,0 @@
1
- q_install=y
2
- q_puppet_symlinks_install=y
3
- q_puppetagent_certname=master
4
- q_puppetagent_install=y
5
- q_puppetagent_pluginsync=y
6
- q_puppetagent_server=master
7
- q_puppetdashboard_database_install=y
8
- q_puppetdashboard_database_name=console
9
- q_puppetdashboard_database_password=puppet
10
- q_puppetdashboard_database_root_password=puppet
11
- q_puppetdashboard_database_user=console
12
- q_puppetdashboard_httpd_port=443
13
- q_puppetdashboard_install=y
14
- q_puppetmaster_certdnsnames=master:puppet
15
- q_puppetmaster_certname=master
16
- q_puppetmaster_dashboard_hostname=master
17
- q_puppetmaster_dashboard_port=443
18
- q_puppetmaster_install=y
19
- q_puppetmaster_use_dashboard_classifier=y
20
- q_puppetmaster_use_dashboard_reports=y
21
- q_rubydevelopment_install=y
22
- q_vendor_packages_install=y
@@ -1,42 +0,0 @@
1
- q_install=y
2
- q_puppet_cloud_install=n
3
- q_puppet_enterpriseconsole_auth_database_name=console_auth
4
- q_puppet_enterpriseconsole_auth_database_password=console_auth
5
- q_puppet_enterpriseconsole_auth_database_user=console_auth
6
- q_puppet_enterpriseconsole_auth_password=console
7
- q_puppet_enterpriseconsole_auth_user_email=console@example.com
8
- q_puppet_enterpriseconsole_database_install=y
9
- q_puppet_enterpriseconsole_database_name=console
10
- q_puppet_enterpriseconsole_database_password=console
11
- q_puppet_enterpriseconsole_database_remote=n
12
- q_puppet_enterpriseconsole_database_root_password=root
13
- q_puppet_enterpriseconsole_database_user=console
14
- q_puppet_enterpriseconsole_httpd_port=443
15
- q_puppet_enterpriseconsole_install=y
16
- q_puppet_enterpriseconsole_inventory_hostname=$(hostname -s)
17
- q_puppet_enterpriseconsole_inventory_port=8140
18
- q_puppet_enterpriseconsole_master_hostname=$(hostname -s)
19
- q_puppet_enterpriseconsole_smtp_host=smtp.google.com
20
- q_puppet_enterpriseconsole_smtp_password=
21
- q_puppet_enterpriseconsole_smtp_port=25
22
- q_puppet_enterpriseconsole_smtp_use_tls=n
23
- q_puppet_enterpriseconsole_smtp_user_auth=n
24
- q_puppet_enterpriseconsole_smtp_username=
25
- q_puppet_symlinks_install=y
26
- q_puppetagent_certname=$(hostname -s)
27
- q_puppetagent_install=y
28
- q_puppetagent_server=$(hostname -s)
29
- q_puppetca_install=y
30
- q_puppetmaster_certname=$(hostname -s)
31
- q_puppetmaster_dnsaltnames=$(hostname -s),puppet,$(hostname -f),puppet.$(domainname)
32
- q_puppetmaster_enterpriseconsole_hostname=localhost
33
- q_puppetmaster_enterpriseconsole_port=443
34
- q_puppetmaster_forward_facts=n
35
- q_puppetmaster_install=y
36
- q_vendor_packages_install=y
37
-
38
- # pe 2.0 option
39
- q_puppet_enterpriseconsole_auth_user=console
40
-
41
- # pe 2.0 - 2.5 upgrade options
42
- q_puppet_enterpriseconsole_setup_auth_db=y
@@ -1,36 +0,0 @@
1
- q_install=y
2
- q_puppet_cloud_install=n
3
- q_puppet_enterpriseconsole_auth_database_name=console_auth
4
- q_puppet_enterpriseconsole_auth_database_password=console_auth
5
- q_puppet_enterpriseconsole_auth_database_user=console_auth
6
- q_puppet_enterpriseconsole_auth_password=console
7
- q_puppet_enterpriseconsole_auth_user_email=console@soupkitchen.internal
8
- q_puppet_enterpriseconsole_database_install=y
9
- q_puppet_enterpriseconsole_database_name=console
10
- q_puppet_enterpriseconsole_database_password=console
11
- q_puppet_enterpriseconsole_database_remote=n
12
- q_puppet_enterpriseconsole_database_root_password=console
13
- q_puppet_enterpriseconsole_database_user=console
14
- q_puppet_enterpriseconsole_httpd_port=443
15
- q_puppet_enterpriseconsole_install=y
16
- q_puppet_enterpriseconsole_inventory_hostname=$(hostname -s)
17
- q_puppet_enterpriseconsole_inventory_port=8140
18
- q_puppet_enterpriseconsole_master_hostname=$(hostname -s)
19
- q_puppet_enterpriseconsole_smtp_host=localhost
20
- q_puppet_enterpriseconsole_smtp_password=
21
- q_puppet_enterpriseconsole_smtp_port=25
22
- q_puppet_enterpriseconsole_smtp_use_tls=n
23
- q_puppet_enterpriseconsole_smtp_user_auth=n
24
- q_puppet_enterpriseconsole_smtp_username=
25
- q_puppet_symlinks_install=y
26
- q_puppetagent_certname=$(hostname -s)
27
- q_puppetagent_install=y
28
- q_puppetagent_server=$(hostname -s)
29
- q_puppetca_install=y
30
- q_puppetmaster_certname=$(hostname -s)
31
- q_puppetmaster_dnsaltnames=$(hostname -s),puppet,$(hostname -f),puppet.$(domainname)
32
- q_puppetmaster_enterpriseconsole_hostname=localhost
33
- q_puppetmaster_enterpriseconsole_port=443
34
- q_puppetmaster_forward_facts=n
35
- q_puppetmaster_install=y
36
- q_vendor_packages_install=y
@@ -1,52 +0,0 @@
1
- q_install=y
2
- q_puppet_cloud_install=n
3
-
4
- q_puppet_enterpriseconsole_auth_database_name=console_auth
5
- q_puppet_enterpriseconsole_auth_database_password=console_auth
6
- q_puppet_enterpriseconsole_auth_database_user=console_auth
7
- q_puppet_enterpriseconsole_auth_password=console
8
- q_puppet_enterpriseconsole_auth_user_email=console@example.com
9
-
10
- # Use existing database
11
- q_puppet_enterpriseconsole_database_install=n
12
- q_puppet_enterpriseconsole_setup_db=y
13
-
14
- q_puppet_enterpriseconsole_database_name=console
15
- q_puppet_enterpriseconsole_database_user=console
16
- q_puppet_enterpriseconsole_database_password=console
17
- q_puppet_enterpriseconsole_database_remote=n
18
- q_puppet_enterpriseconsole_database_root_password=console
19
-
20
- q_puppet_enterpriseconsole_httpd_port=443
21
- q_puppet_enterpriseconsole_install=y
22
-
23
- q_puppet_enterpriseconsole_inventory_hostname=master
24
- q_puppet_enterpriseconsole_inventory_port=8140
25
-
26
- q_puppet_enterpriseconsole_master_hostname=master
27
-
28
- q_puppet_enterpriseconsole_smtp_host=smtp.google.com
29
- q_puppet_enterpriseconsole_smtp_password=
30
- q_puppet_enterpriseconsole_smtp_port=25
31
- q_puppet_enterpriseconsole_smtp_use_tls=n
32
- q_puppet_enterpriseconsole_smtp_user_auth=n
33
- q_puppet_enterpriseconsole_smtp_username=
34
-
35
- q_puppet_symlinks_install=y
36
- q_puppetagent_certname=master
37
- q_puppetagent_install=y
38
- q_puppetagent_server=master
39
- q_puppetca_install=y
40
- q_puppetmaster_certname=master
41
- q_puppetmaster_dnsaltnames=master,puppet
42
- q_puppetmaster_enterpriseconsole_hostname=localhost
43
- q_puppetmaster_enterpriseconsole_port=443
44
- q_puppetmaster_forward_facts=n
45
- q_puppetmaster_install=y
46
- q_vendor_packages_install=y
47
-
48
- # pe 2.0 option
49
- q_puppet_enterpriseconsole_auth_user=console
50
-
51
- # pe 2.0 - 2.5 upgrade options
52
- q_puppet_enterpriseconsole_setup_auth_db=y
@@ -1,10 +0,0 @@
1
- q_install=y
2
- q_puppet_cloud_install=n
3
- q_puppet_enterpriseconsole_install=n
4
- q_puppet_symlinks_install=y
5
- q_puppetagent_certname=<%= @env[:vm].name %>
6
- q_puppetagent_install=y
7
- q_puppetagent_server=<%= config.master %>
8
- q_puppetmaster_install=n
9
- q_vendor_packages_install=y
10
- q_continue_or_reenter_master_hostname=c
@@ -1,52 +0,0 @@
1
- q_install=y
2
- q_puppet_cloud_install=n
3
-
4
- q_puppet_enterpriseconsole_auth_database_name=console_auth
5
- q_puppet_enterpriseconsole_auth_database_password=console_auth
6
- q_puppet_enterpriseconsole_auth_database_user=console_auth
7
- q_puppet_enterpriseconsole_auth_password=console
8
- q_puppet_enterpriseconsole_auth_user_email=console@example.com
9
-
10
- # Use existing database
11
- q_puppet_enterpriseconsole_database_install=n
12
- q_puppet_enterpriseconsole_setup_db=y
13
-
14
- q_puppet_enterpriseconsole_database_name=console
15
- q_puppet_enterpriseconsole_database_user=console
16
- q_puppet_enterpriseconsole_database_password=console
17
- q_puppet_enterpriseconsole_database_remote=n
18
- q_puppet_enterpriseconsole_database_root_password=console
19
-
20
- q_puppet_enterpriseconsole_httpd_port=443
21
- q_puppet_enterpriseconsole_install=y
22
-
23
- q_puppet_enterpriseconsole_inventory_hostname=master
24
- q_puppet_enterpriseconsole_inventory_port=8140
25
-
26
- q_puppet_enterpriseconsole_master_hostname=master
27
-
28
- q_puppet_enterpriseconsole_smtp_host=smtp.google.com
29
- q_puppet_enterpriseconsole_smtp_password=
30
- q_puppet_enterpriseconsole_smtp_port=25
31
- q_puppet_enterpriseconsole_smtp_use_tls=n
32
- q_puppet_enterpriseconsole_smtp_user_auth=n
33
- q_puppet_enterpriseconsole_smtp_username=
34
-
35
- q_puppet_symlinks_install=y
36
- q_puppetagent_certname=<%= @env[:vm].name %>
37
- q_puppetagent_install=y
38
- q_puppetagent_server=<%= @env[:vm].name %>
39
- q_puppetca_install=y
40
- q_puppetmaster_certname=master
41
- q_puppetmaster_dnsaltnames=master,puppet
42
- q_puppetmaster_enterpriseconsole_hostname=localhost
43
- q_puppetmaster_enterpriseconsole_port=443
44
- q_puppetmaster_forward_facts=n
45
- q_puppetmaster_install=y
46
- q_vendor_packages_install=y
47
-
48
- # pe 2.0 option
49
- q_puppet_enterpriseconsole_auth_user=console
50
-
51
- # pe 2.0 - 2.5 upgrade options
52
- q_puppet_enterpriseconsole_setup_auth_db=y