vagrant-pe_build 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60203f10382b8165bd7ed0cb6719bfa64e26f72d
-  data.tar.gz: 523aae2be9317ea18ab6169ba68a098be1f17c65
+  metadata.gz: bd7aed48459e1704609d04c6530ba8ab70fd43a1
+  data.tar.gz: 994dcf14bf43b75f159dc45372d1b3900e736b6f
 SHA512:
-  metadata.gz: 4b695d95bde3f22905e42215aff2b049c258adbfbd0d42fe5c5fa7e2dea13cb18bef4da860dcf165f301b1794c0537ba1587ef5331c0bc32755d5d004bb5d06e
-  data.tar.gz: 190db868e4a29c6e438fcdc3d8977f44e49b458a4499942451e8375936850ea6d3c4e6c6eea7c26ef4d8dbae4ddeb72b8463c9ea2647d8bc9a31e1f5f13ee9c8
+  metadata.gz: 6928c7749225819794f26be8265c0b52255827df2e44916c55e8189dd3b6bb46e49cb6d2b061c74a1ae17f30a97048cc93fd3f1151bc4437b683183ed103c036
+  data.tar.gz: 53faafebffffb6aec6053cf9ababe1ca5cce902620fe033085affeee9951a5d97a8f612f04e5db5b6d112b6d558f7a8381546196b9396ba61a54fa82f48670bb

data/CHANGELOG

@@ -1,6 +1,25 @@
 vagrant-pe_build
 ================
 
+0.12.0
+------
+
+2015-09-24
+
+This is a backwards compatible feature release.
+
+  * (GH-89) Support 2015.2.x master platforms and Windows
+    This release adds support for all 2015.x.2 master platforms:
+
+      - Enterprise Linux: 6, 7
+      - Ubuntu: 12.04, 14.04
+      - SLES: 11, 12
+
+    Tarball installers are no longer available for other agent platforms, so
+    support for those is currently pending. Windows installation is still
+    supported.
+
+
 0.11.0
 ------
 

data/acceptance/pe_build/pe_bootstrap_2015x_spec.rb

@@ -0,0 +1,45 @@
+shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
+  if !File.file?(options[:box])
+    raise ArgumentError,
+      "A box file must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
+  end
+
+  include_context 'acceptance'
+
+  let(:extra_env) do
+    vars = options[:env_vars].dup
+    vars['PE_BUILD_DOWNLOAD_ROOT'] = options[:archive_path]
+
+    vars
+  end
+
+  before(:each) do
+    # The skelton sets up a Vagrantfile which expects the OS under test to be
+    # available as `box`.
+    environment.skeleton('2015x_acceptance')
+    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
+  end
+
+  after(:each) do
+    # Ensure any VMs that survived tests are cleaned up.
+    assert_execute('vagrant', 'destroy', '--force', log: false)
+  end
+
+  context 'when installing PE 2015.2.0' do
+    it 'provisions with pe_build' do
+      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-201520-master', 'pe-201520-agent')
+    end
+  end
+
+  context 'when installing PE 2015.2.1' do
+    it 'provisions with pe_build' do
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-201521-master', 'pe-201521-agent')
+    end
+  end
+
+  context 'when installing PE 2015.latest' do
+    it 'provisions with pe_build' do
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2015latest-master', 'pe-2015latest-agent')
+    end
+  end
+end

data/acceptance/skeletons/2015x_acceptance/Vagrantfile

@@ -0,0 +1,94 @@
+def set_resources box, max_ram=512, max_cpu=1
+  box.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--cpus", max_cpu]
+    vb.customize ["modifyvm", :id, "--memory", max_ram]
+  end
+end
+
+Vagrant.configure('2') do |config|
+  config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
+  # This is the box name used by the setup helpers in the acceptance tests.
+  config.vm.box = 'box'
+  config.vm.provision :shell, :inline => 'service iptables stop'
+
+  config.vm.define 'pe-201520-master' do |node|
+    node.vm.hostname = 'pe-201520-master.pe-bootstrap.vlan'
+    # All-in-one master nodes need a generous amount of RAM for all the Java.
+    set_resources node, 4096, 1
+
+    node.vm.network 'private_network', :ip => '10.20.1.100'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-201520-agent.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version = '2015.2.0'
+      p.role = :master
+    end
+  end
+
+  config.vm.define 'pe-201520-agent' do |node|
+    node.vm.hostname = 'pe-201520-agent.pe-bootstrap.vlan'
+
+    node.vm.network 'private_network', :ip => '10.20.1.101'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.100 pe-201520-master.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version = '2015.2.0'
+      p.role = :agent
+      p.master = 'pe-201520-master.pe-bootstrap.vlan'
+    end
+  end
+
+  config.vm.define 'pe-201521-master' do |node|
+    node.vm.hostname = 'pe-201521-master.pe-bootstrap.vlan'
+    # All-in-one master nodes need a generous amount of RAM for all the Java.
+    set_resources node, 4096, 1
+
+    node.vm.network 'private_network', :ip => '10.20.1.102'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-201521-agent.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version = '2015.2.1'
+      p.role = :master
+    end
+  end
+
+  config.vm.define 'pe-201521-agent' do |node|
+    node.vm.hostname = 'pe-201521-agent.pe-bootstrap.vlan'
+
+    node.vm.network 'private_network', :ip => '10.20.1.103'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-201521-master.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version = '2015.2.1'
+      p.role = :agent
+      p.master = 'pe-201521-master.pe-bootstrap.vlan'
+    end
+  end
+
+  config.vm.define 'pe-2015latest-master' do |node|
+    node.vm.hostname = 'pe-2015latest-master.pe-bootstrap.vlan'
+    # All-in-one master nodes need a generous amount of RAM for all the Java.
+    set_resources node, 4096, 1
+
+    node.vm.network 'private_network', :ip => '10.20.1.104'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.105 pe-2015latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version_file = 'LATEST'
+      p.role = :master
+    end
+  end
+
+  config.vm.define 'pe-2015latest-agent' do |node|
+    node.vm.hostname = 'pe-2015latest-agent.pe-bootstrap.vlan'
+
+    node.vm.network 'private_network', :ip => '10.20.1.105'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.104 pe-2015latest-master.pe-bootstrap.vlan" >> /etc/hosts'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.version_file = 'LATEST'
+      p.role = :agent
+      p.master = 'pe-2015latest-master.pe-bootstrap.vlan'
+    end
+  end
+end

data/lib/pe_build/release.rb

@@ -37,7 +37,8 @@ module PEBuild
     require 'pe_build/release/3_3'
     require 'pe_build/release/3_7'
     require 'pe_build/release/3_8'
+    require 'pe_build/release/2015_2'
 
-    LATEST_VERSION = '3.8.2'
+    LATEST_VERSION = '2015.2.1'
   end
 end

data/lib/pe_build/release/2015_2.rb

@@ -0,0 +1,37 @@
+require 'pe_build/release'
+
+module PEBuild::Release
+
+  twentyfifteen_two_x = newrelease do
+
+    # PE 2015.2.x supports many more platforms, but the pe_bootstrap
+    # provisioner can only work with tarball installers --- which are now only
+    # available for the following master platforms:
+    add_release :el, '6'
+    add_release :el, '7'
+
+    add_release :sles, '11'
+    add_release :sles, '12'
+
+    add_release :ubuntu, '12.04'
+    add_release :ubuntu, '14.04'
+
+    # Nothing has changed for installation of Windows agents.
+
+    add_release :windows, '2003'
+    add_release :windows, '2003R2'
+    add_release :windows, '2008'
+    add_release :windows, '2008R2'
+    add_release :windows, '7'
+    add_release :windows, '2012'
+    add_release :windows, '2012R2'
+    add_release :windows, '8'
+    add_release :windows, '8.1'
+
+    set_answer_file :master, File.join(PEBuild.template_dir, 'answers', 'master-2015.x.txt.erb')
+    set_answer_file :agent,  File.join(PEBuild.template_dir, 'answers', 'agent-2015.x.txt.erb')
+  end
+
+  @releases['2015.2.0'] = twentyfifteen_two_x
+  @releases['2015.2.1'] = twentyfifteen_two_x
+end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/templates/answers/agent-2015.x.txt.erb

@@ -0,0 +1,19 @@
+# Agent answers for 2015.x
+# Cobbled together from split install examples.
+q_install=y
+q_vendor_packages_install=y
+q_puppet_symlinks_install=y
+q_verify_packages=y
+
+# Disable all infrastructure components
+q_all_in_one_install=n
+q_puppetmaster_install=n
+q_puppetdb_install=n
+q_puppet_enterpriseconsole_install=n
+
+# Configure agent installation
+q_puppetagent_install=y
+q_puppetagent_certname=<%= machine_hostname %>
+q_puppetagent_server=<%= @config.master %>
+q_skip_master_verification=n
+q_fail_on_unsuccessful_master_lookup=y

data/templates/answers/master-2015.x.txt.erb

@@ -0,0 +1,33 @@
+# Stock all-in-one answers for 2015.x
+q_install=y
+q_vendor_packages_install=y
+q_puppetmaster_install=y
+q_all_in_one_install=y
+
+
+q_puppetagent_certname=<%= machine_hostname %>
+q_puppetmaster_certname=<%= machine_hostname %>
+q_puppetmaster_dnsaltnames=<%= machine_hostname %>,puppet
+
+q_puppet_enterpriseconsole_httpd_port=443
+q_puppet_enterpriseconsole_auth_password=puppetlabs
+
+q_database_install=y
+q_puppetdb_database_name=pe-puppetdb
+q_puppetdb_database_password=strongpassword1748
+q_puppetdb_database_user=pe-puppetdb
+
+q_exit_for_nc_migrate=n
+
+
+# Use Vagrant configuration instead of DNS
+q_database_host=<%= machine_hostname %>
+q_puppetdb_hostname=<%= machine_hostname %>
+q_puppet_enterpriseconsole_master_hostname=<%= machine_hostname %>
+q_puppetmaster_enterpriseconsole_hostname=<%= machine_hostname %>
+q_puppetca_hostname=<%= machine_hostname %>
+q_puppetagent_server=<%= machine_hostname %>
+
+
+# Additional customization
+q_pe_check_for_updates=n

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -81,9 +81,11 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- acceptance/pe_build/pe_bootstrap_2015x_spec.rb
 - acceptance/pe_build/pe_bootstrap_3x_spec.rb
 - acceptance/pe_build/pe_bootstrap_latest_spec.rb
 - acceptance/pe_build/pe_build_cli_spec.rb
+- acceptance/skeletons/2015x_acceptance/Vagrantfile
 - acceptance/skeletons/pe_build/Vagrantfile
 - doc/answers/README.markdown
 - doc/answers/agent.txt
@@ -126,6 +128,7 @@ files:
 - lib/pe_build/provisioner/pe_bootstrap/post_install.rb
 - lib/pe_build/release.rb
 - lib/pe_build/release/1_2.rb
+- lib/pe_build/release/2015_2.rb
 - lib/pe_build/release/2_0.rb
 - lib/pe_build/release/2_5.rb
 - lib/pe_build/release/2_6.rb
@@ -161,10 +164,12 @@ files:
 - templates/answers/agent-1.x.txt.erb
 - templates/answers/agent-2.0.x.txt.erb
 - templates/answers/agent-2.x.txt.erb
+- templates/answers/agent-2015.x.txt.erb
 - templates/answers/agent-3.x.txt.erb
 - templates/answers/master-1.x.txt.erb
 - templates/answers/master-2.0.x.txt.erb
 - templates/answers/master-2.x.txt.erb
+- templates/answers/master-2015.x.txt.erb
 - templates/answers/master-3.x.txt.erb
 - templates/locales/en.yml
 - vagrant-pe_build.gemspec
@@ -194,4 +199,3 @@ signing_key:
 specification_version: 4
 summary: Vagrant provisioner for installing Puppet Enterprise
 test_files: []
-has_rdoc: