oscar 0.2.0alpha3 → 0.2.0alpha4

data/lib/oscar/environment.rb

@@ -21,7 +21,14 @@ class Oscar::Environment
       @nodes << node
     end
 
+    pe_build_options = @config.data["provisioners"].find do |hash|
+      hash["name"] == "pe_build"
+    end
+
     Vagrant::Config.run do |config|
+      config.pe_build.download_root = pe_build_options["options"]["download_root"]
+      config.pe_build.version       = pe_build_options["options"]["version"]
+      config.pe_build.filename      = pe_build_options["options"]["filename"]
       @nodes.each { |node| node.define(config) }
     end
   end

data/lib/oscar/networking.rb

@@ -30,7 +30,7 @@ class Oscar::Networking
     arr = []
 
     arr << ['127.0.0.1', ['localhost']]
-    arr << ['127.0.1.1', ["#{node.name}.#{@domainname}", node.name]]
+    arr << ['127.0.1.1', [node.name]]
 
     @nodes.each_pair { |address, n| arr << [address, [n.name, "#{n.name}.#{@domainname}"]] }
 

data/lib/oscar/schema.yaml

@@ -62,6 +62,18 @@ mapping:
           name: { required: true }
           "forwards": *forwards
 
+  "provisioners":
+    desc: "bla bla bla"
+    type: seq
+    sequence:
+      -
+        type: map
+        mapping:
+          "name":
+            required: true
+          "options":
+            type: any
+
   # Network configuration for oscar, not applicable to any node.
   "networking":
     type: map

data/lib/oscar/version.rb

@@ -1,3 +1,3 @@
 module Oscar
-  VERSION = '0.2.0alpha3'
+  VERSION = '0.2.0alpha4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oscar
 version: !ruby/object:Gem::Version
-  version: 0.2.0alpha3
+  version: 0.2.0alpha4
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -104,15 +104,8 @@ files:
 - Gemfile
 - LICENSE
 - README.markdown
-- Vagrantfile
 - config/.gitignore
 - config/roles.yaml.dist
-- doc/answers/README.markdown
-- doc/answers/agent.txt
-- doc/answers/master-1.1.txt
-- doc/answers/master-2.0.0.txt
-- doc/answers/master-2.5.0.txt
-- doc/answers/master-db.txt
 - lib/oscar.rb
 - lib/oscar/config.rb
 - lib/oscar/environment.rb
@@ -122,8 +115,6 @@ files:
 - lib/oscar/version.rb
 - lib/vagrant_init.rb
 - oscar.gemspec
-- templates/answers/agent.txt.erb
-- templates/answers/master.txt.erb
 homepage: https://github.com/adrienthebo/oscar
 licenses: []
 post_install_message: 

data/Vagrantfile

@@ -1,5 +0,0 @@
-# lol shim
-$LOAD_PATH << "#{File.dirname(__FILE__)}/lib"
-require 'oscar'
-
-Oscar.load! File.dirname(__FILE__)

data/doc/answers/README.markdown

@@ -1 +0,0 @@
-These are reference answers files for the various versions of PE.

data/doc/answers/agent.txt

@@ -1,10 +0,0 @@
-q_install=y
-q_puppet_cloud_install=n
-q_puppet_enterpriseconsole_install=n
-q_puppet_symlinks_install=y
-q_puppetagent_certname=$(hostname -s)
-q_puppetagent_install=y
-q_puppetagent_server=master
-q_puppetmaster_install=n
-q_vendor_packages_install=y
-q_continue_or_reenter_master_hostname=c

data/doc/answers/master-1.1.txt

@@ -1,22 +0,0 @@
-q_install=y
-q_puppet_symlinks_install=y
-q_puppetagent_certname=master
-q_puppetagent_install=y
-q_puppetagent_pluginsync=y
-q_puppetagent_server=master
-q_puppetdashboard_database_install=y
-q_puppetdashboard_database_name=console
-q_puppetdashboard_database_password=puppet
-q_puppetdashboard_database_root_password=puppet
-q_puppetdashboard_database_user=console
-q_puppetdashboard_httpd_port=443
-q_puppetdashboard_install=y
-q_puppetmaster_certdnsnames=master:puppet
-q_puppetmaster_certname=master
-q_puppetmaster_dashboard_hostname=master
-q_puppetmaster_dashboard_port=443
-q_puppetmaster_install=y
-q_puppetmaster_use_dashboard_classifier=y
-q_puppetmaster_use_dashboard_reports=y
-q_rubydevelopment_install=y
-q_vendor_packages_install=y

data/doc/answers/master-2.0.0.txt

@@ -1,42 +0,0 @@
-q_install=y
-q_puppet_cloud_install=n
-q_puppet_enterpriseconsole_auth_database_name=console_auth
-q_puppet_enterpriseconsole_auth_database_password=console_auth
-q_puppet_enterpriseconsole_auth_database_user=console_auth
-q_puppet_enterpriseconsole_auth_password=console
-q_puppet_enterpriseconsole_auth_user_email=console@example.com
-q_puppet_enterpriseconsole_database_install=y
-q_puppet_enterpriseconsole_database_name=console
-q_puppet_enterpriseconsole_database_password=console
-q_puppet_enterpriseconsole_database_remote=n
-q_puppet_enterpriseconsole_database_root_password=root
-q_puppet_enterpriseconsole_database_user=console
-q_puppet_enterpriseconsole_httpd_port=443
-q_puppet_enterpriseconsole_install=y
-q_puppet_enterpriseconsole_inventory_hostname=$(hostname -s)
-q_puppet_enterpriseconsole_inventory_port=8140
-q_puppet_enterpriseconsole_master_hostname=$(hostname -s)
-q_puppet_enterpriseconsole_smtp_host=smtp.google.com
-q_puppet_enterpriseconsole_smtp_password=
-q_puppet_enterpriseconsole_smtp_port=25
-q_puppet_enterpriseconsole_smtp_use_tls=n
-q_puppet_enterpriseconsole_smtp_user_auth=n
-q_puppet_enterpriseconsole_smtp_username=
-q_puppet_symlinks_install=y
-q_puppetagent_certname=$(hostname -s)
-q_puppetagent_install=y
-q_puppetagent_server=$(hostname -s)
-q_puppetca_install=y
-q_puppetmaster_certname=$(hostname -s)
-q_puppetmaster_dnsaltnames=$(hostname -s),puppet,$(hostname -f),puppet.$(domainname)
-q_puppetmaster_enterpriseconsole_hostname=localhost
-q_puppetmaster_enterpriseconsole_port=443
-q_puppetmaster_forward_facts=n
-q_puppetmaster_install=y
-q_vendor_packages_install=y
-
-# pe 2.0 option
-q_puppet_enterpriseconsole_auth_user=console
-
-# pe 2.0 - 2.5 upgrade options
-q_puppet_enterpriseconsole_setup_auth_db=y

data/doc/answers/master-2.5.0.txt

@@ -1,36 +0,0 @@
-q_install=y
-q_puppet_cloud_install=n
-q_puppet_enterpriseconsole_auth_database_name=console_auth
-q_puppet_enterpriseconsole_auth_database_password=console_auth
-q_puppet_enterpriseconsole_auth_database_user=console_auth
-q_puppet_enterpriseconsole_auth_password=console
-q_puppet_enterpriseconsole_auth_user_email=console@soupkitchen.internal
-q_puppet_enterpriseconsole_database_install=y
-q_puppet_enterpriseconsole_database_name=console
-q_puppet_enterpriseconsole_database_password=console
-q_puppet_enterpriseconsole_database_remote=n
-q_puppet_enterpriseconsole_database_root_password=console
-q_puppet_enterpriseconsole_database_user=console
-q_puppet_enterpriseconsole_httpd_port=443
-q_puppet_enterpriseconsole_install=y
-q_puppet_enterpriseconsole_inventory_hostname=$(hostname -s)
-q_puppet_enterpriseconsole_inventory_port=8140
-q_puppet_enterpriseconsole_master_hostname=$(hostname -s)
-q_puppet_enterpriseconsole_smtp_host=localhost
-q_puppet_enterpriseconsole_smtp_password=
-q_puppet_enterpriseconsole_smtp_port=25
-q_puppet_enterpriseconsole_smtp_use_tls=n
-q_puppet_enterpriseconsole_smtp_user_auth=n
-q_puppet_enterpriseconsole_smtp_username=
-q_puppet_symlinks_install=y
-q_puppetagent_certname=$(hostname -s)
-q_puppetagent_install=y
-q_puppetagent_server=$(hostname -s)
-q_puppetca_install=y
-q_puppetmaster_certname=$(hostname -s)
-q_puppetmaster_dnsaltnames=$(hostname -s),puppet,$(hostname -f),puppet.$(domainname)
-q_puppetmaster_enterpriseconsole_hostname=localhost
-q_puppetmaster_enterpriseconsole_port=443
-q_puppetmaster_forward_facts=n
-q_puppetmaster_install=y
-q_vendor_packages_install=y

data/doc/answers/master-db.txt

@@ -1,52 +0,0 @@
-q_install=y
-q_puppet_cloud_install=n
-
-q_puppet_enterpriseconsole_auth_database_name=console_auth
-q_puppet_enterpriseconsole_auth_database_password=console_auth
-q_puppet_enterpriseconsole_auth_database_user=console_auth
-q_puppet_enterpriseconsole_auth_password=console
-q_puppet_enterpriseconsole_auth_user_email=console@example.com
-
-# Use existing database
-q_puppet_enterpriseconsole_database_install=n
-q_puppet_enterpriseconsole_setup_db=y
-
-q_puppet_enterpriseconsole_database_name=console
-q_puppet_enterpriseconsole_database_user=console
-q_puppet_enterpriseconsole_database_password=console
-q_puppet_enterpriseconsole_database_remote=n
-q_puppet_enterpriseconsole_database_root_password=console
-
-q_puppet_enterpriseconsole_httpd_port=443
-q_puppet_enterpriseconsole_install=y
-
-q_puppet_enterpriseconsole_inventory_hostname=master
-q_puppet_enterpriseconsole_inventory_port=8140
-
-q_puppet_enterpriseconsole_master_hostname=master
-
-q_puppet_enterpriseconsole_smtp_host=smtp.google.com
-q_puppet_enterpriseconsole_smtp_password=
-q_puppet_enterpriseconsole_smtp_port=25
-q_puppet_enterpriseconsole_smtp_use_tls=n
-q_puppet_enterpriseconsole_smtp_user_auth=n
-q_puppet_enterpriseconsole_smtp_username=
-
-q_puppet_symlinks_install=y
-q_puppetagent_certname=master
-q_puppetagent_install=y
-q_puppetagent_server=master
-q_puppetca_install=y
-q_puppetmaster_certname=master
-q_puppetmaster_dnsaltnames=master,puppet
-q_puppetmaster_enterpriseconsole_hostname=localhost
-q_puppetmaster_enterpriseconsole_port=443
-q_puppetmaster_forward_facts=n
-q_puppetmaster_install=y
-q_vendor_packages_install=y
-
-# pe 2.0 option
-q_puppet_enterpriseconsole_auth_user=console
-
-# pe 2.0 - 2.5 upgrade options
-q_puppet_enterpriseconsole_setup_auth_db=y

data/templates/answers/agent.txt.erb

@@ -1,10 +0,0 @@
-q_install=y
-q_puppet_cloud_install=n
-q_puppet_enterpriseconsole_install=n
-q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= @env[:vm].name %>
-q_puppetagent_install=y
-q_puppetagent_server=<%= config.master %>
-q_puppetmaster_install=n
-q_vendor_packages_install=y
-q_continue_or_reenter_master_hostname=c

data/templates/answers/master.txt.erb

@@ -1,52 +0,0 @@
-q_install=y
-q_puppet_cloud_install=n
-
-q_puppet_enterpriseconsole_auth_database_name=console_auth
-q_puppet_enterpriseconsole_auth_database_password=console_auth
-q_puppet_enterpriseconsole_auth_database_user=console_auth
-q_puppet_enterpriseconsole_auth_password=console
-q_puppet_enterpriseconsole_auth_user_email=console@example.com
-
-# Use existing database
-q_puppet_enterpriseconsole_database_install=n
-q_puppet_enterpriseconsole_setup_db=y
-
-q_puppet_enterpriseconsole_database_name=console
-q_puppet_enterpriseconsole_database_user=console
-q_puppet_enterpriseconsole_database_password=console
-q_puppet_enterpriseconsole_database_remote=n
-q_puppet_enterpriseconsole_database_root_password=console
-
-q_puppet_enterpriseconsole_httpd_port=443
-q_puppet_enterpriseconsole_install=y
-
-q_puppet_enterpriseconsole_inventory_hostname=master
-q_puppet_enterpriseconsole_inventory_port=8140
-
-q_puppet_enterpriseconsole_master_hostname=master
-
-q_puppet_enterpriseconsole_smtp_host=smtp.google.com
-q_puppet_enterpriseconsole_smtp_password=
-q_puppet_enterpriseconsole_smtp_port=25
-q_puppet_enterpriseconsole_smtp_use_tls=n
-q_puppet_enterpriseconsole_smtp_user_auth=n
-q_puppet_enterpriseconsole_smtp_username=
-
-q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= @env[:vm].name %>
-q_puppetagent_install=y
-q_puppetagent_server=<%= @env[:vm].name %>
-q_puppetca_install=y
-q_puppetmaster_certname=master
-q_puppetmaster_dnsaltnames=master,puppet
-q_puppetmaster_enterpriseconsole_hostname=localhost
-q_puppetmaster_enterpriseconsole_port=443
-q_puppetmaster_forward_facts=n
-q_puppetmaster_install=y
-q_vendor_packages_install=y
-
-# pe 2.0 option
-q_puppet_enterpriseconsole_auth_user=console
-
-# pe 2.0 - 2.5 upgrade options
-q_puppet_enterpriseconsole_setup_auth_db=y