vagrant-orchestrate 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f4c2c23fc36ac0e8c472263b585d736444cde7
-  data.tar.gz: d85359d431acc54e007e5089e97b5391dc2af394
+  metadata.gz: 23910236a77b4ef2a42c5bc7fbe15f21083387c6
+  data.tar.gz: 4337fc38a9860cfabbbf8caa76379f04350b5870
 SHA512:
-  metadata.gz: 14e2b97efed9fd854b9abdb285869780a8e9145f07747105da88e902c73845e4b50d779c9e1059d70d8d59cd4b071181abe419a5ea55f95dd6e954a6a7f96208
-  data.tar.gz: bcfe1a59b4013c6905132bced3e6dc9f3617b5edb3594e268ea32ac81e34c846a3191a88ae14c7380cd14f0d2b122402da117bdf345f31035e400433a9dff51a
+  metadata.gz: dd6785a727f48143884d8d7455648a8f52f076ff8a703413872c17b55acb8d3936f9c890bd60cbf07e5b1b6f0fdc286365aebd5dec16c5887633531a47335939
+  data.tar.gz: bfedff81ef33fbd3ba404be46b9a342f485003f7ec36229f72036218370bd775359ddd5c88e77abb74943e5b5d2b34221d158ad0b4fc944f673f2b0e71f47e74

data/Gemfile

@@ -11,4 +11,5 @@ end
 group :plugins do
   gem "vagrant-orchestrate", path: "."
   gem "vagrant-managed-servers"
+  gem "vagrant-librarian-puppet"
 end

data/README.md

@@ -17,18 +17,18 @@ Initialize a Vagrantfile to orchestrate running a script on multiple managed ser
 
     $ vagrant orchestrate init --shell
 
-You'll need to edit your Vagrantfile and replace some of variables, such as ssh username and
+You'll need to edit your Vagrantfile and replace some variables, such as ssh username and
 password, and the path to the script to run. The first line of the file defines an array of
 managed servers that the `push` command will operate on.
 
 This works for Windows managed servers as well
 
-    $ vagrant orchestrate init --winrm [--winrm-username=USERNAME --winrm-password=PASSWORD]
+    $ vagrant orchestrate init --winrm [--winrm-username USERNAME --winrm-password PASSWORD]
 
 For a full list of init options, run `vagrant orchestrate init --help`
 
 ### Pushing changes
-Go ahead and push changes to your managed servers.
+Go ahead and push changes to your managed servers
 
     $ vagrant orchestrate push
 
@@ -46,7 +46,7 @@ merge that feature into downstream environments to avoid conflicts.
 
 ## Tips for Windows hosts
 
-* Need rsync? Install [OpenSSH](http://www.mls-software.com/opensshd.html) and then run this [script]() to install rsync. Vagrant managed servers currently only works with cygwin based rsync implementations.
+* Need rsync? Install [OpenSSH](http://www.mls-software.com/opensshd.html) and then run this [script](https://github.com/joefitzgerald/packer-windows/blob/master/scripts/rsync.bat) to install rsync. Vagrant managed servers currently only works with cygwin based rsync implementations.
 
 ## Contributing
 

data/lib/vagrant-orchestrate/command/init.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
         DEFAULT_SSH_PRIVATE_KEY_PATH = "{{YOUR_SSH_PRIVATE_KEY_PATH}}"
         DEFAULT_PLUGINS = ["vagrant-managed-servers"]
 
-        # rubocop:disable Metrics/AbcSize, MethodLength
+        # rubocop:disable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity
         def execute
           options = {}
 
@@ -52,6 +52,15 @@ module VagrantPlugins
               options[:provisioners] << "puppet"
             end
 
+            o.on("--puppet-hiera", "Include templates for hiera. Only with --puppet") do |p|
+              options[:puppet_hiera] = p
+            end
+
+            o.on("--puppet-librarian-puppet",
+                 "Include a Puppetfile and the vagrant-librarian-puppet plugin. Only with --puppet") do |p|
+              options[:puppet_librarian_puppet] = p
+            end
+
             o.on("--ssh-username USERNAME", String, "The username for communicating over ssh") do |u|
               options[:ssh_username] = u
             end
@@ -92,6 +101,31 @@ module VagrantPlugins
           argv = parse_options(opts)
           return unless argv
 
+          if options[:provisioners].include? "puppet"
+            options[:puppet_librarian_puppet] ||= true
+            if options[:puppet_librarian_puppet]
+              contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/Puppetfile"))
+              write_file "Puppetfile", contents, options
+              FileUtils.mkdir_p(File.join(@env.cwd, "modules"))
+              contents = "# This is a placeholder file to keep the modules directory around."
+              write_file(File.join(@env.cwd, "modules", ".PLACEHOLDER"), contents, options)
+              options[:plugins] << "vagrant-librarian-puppet"
+              @env.ui.info(I18n.t("vagrant_orchestrate.librarian_puppet.gitignore"), prefix: false)
+            end
+
+            options[:puppet_hiera] ||= true
+            if options[:puppet_hiera]
+              contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/hiera.yaml"))
+              write_file("hiera.yaml", contents, options)
+              FileUtils.mkdir_p(File.join(@env.cwd, "hiera"))
+              contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/hiera/common.yaml"))
+              write_file(File.join(@env.cwd, "hiera", "common.yaml"), contents, options)
+            end
+
+            FileUtils.mkdir_p(File.join(@env.cwd, "manifests"))
+            write_file(File.join(@env.cwd, "manifests", "default.pp"), "# Your puppet code goes here", options)
+          end
+
           options[:shell_paths] ||= options[:shell_inline] ? [] : [DEFAULT_SHELL_PATH]
           options[:shell_inline] ||= DEFAULT_SHELL_INLINE
           options[:winrm_username] ||= DEFAULT_WINRM_USERNAME
@@ -105,6 +139,8 @@ module VagrantPlugins
                                              provisioners: options[:provisioners],
                                              shell_paths: options[:shell_paths],
                                              shell_inline: options[:shell_inline],
+                                             puppet_librarian_puppet: options[:puppet_librarian_puppet],
+                                             puppet_hiera: options[:puppet_hiera],
                                              communicator: options[:communicator],
                                              winrm_username: options[:winrm_username],
                                              winrm_password: options[:winrm_password],
@@ -114,19 +150,19 @@ module VagrantPlugins
                                              servers: options[:servers],
                                              plugins: options[:plugins]
                                              )
-          write_vagrantfile(contents, options)
+          write_file("Vagrantfile", contents, options)
 
           @env.ui.info(I18n.t("vagrant.commands.init.success"), prefix: false)
 
           # Success, exit status 0
           0
         end
-        # rubocop:enable Metrics/AbcSize, MethodLength
+        # rubocop:enable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity
 
         private
 
-        def write_vagrantfile(contents, options)
-          save_path = Pathname.new("Vagrantfile").expand_path(@env.cwd)
+        def write_file(filename, contents, options)
+          save_path = Pathname.new(filename).expand_path(@env.cwd)
           save_path.delete if save_path.exist? && options[:force]
           fail Vagrant::Errors::VagrantfileExistsError if save_path.exist?
 

data/lib/vagrant-orchestrate/plugin.rb

@@ -19,6 +19,9 @@ module VagrantPlugins
       DESC
 
       command(:orchestrate) do
+        setup_i18n
+        setup_logging
+
         require_relative "command/root"
         Command::Root
       end

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/locales/en.yml

@@ -0,0 +1,7 @@
+en:
+  vagrant_orchestrate:
+    librarian_puppet:
+      gitignore: |-
+        It is recommended that you add the following lines to your .gitignore:
+          /modules/
+          !/modules/.PLACEHOLDER

data/spec/vagrant-orchestrate/command/init_spec.rb

@@ -75,13 +75,19 @@ describe VagrantPlugins::Orchestrate::Command::Init do
     end
   end
 
-  context "puppet provisioner" do
+  context "puppet" do
     describe "basic operation" do
       let(:argv) { ["--provision-with", "puppet"] }
       it "creates a vagrantfile with a puppet provisioner" do
         subject.execute
         expect(iso_env.vagrantfile.config.vm.provisioners.first.type).to eq(:puppet)
       end
+
+      it "creates the default files" do
+        subject.execute
+        expect(Dir.entries(iso_env.cwd)).to include("manifests")
+        expect(Dir.entries(File.join(iso_env.cwd, "manifests"))).to include("default.pp")
+      end
     end
 
     describe "shorthand" do
@@ -91,6 +97,54 @@ describe VagrantPlugins::Orchestrate::Command::Init do
         expect(iso_env.vagrantfile.config.vm.provisioners.first.type).to eq(:puppet)
       end
     end
+
+    describe "librarian puppet" do
+      let(:argv) { ["--puppet", "--puppet-librarian-puppet"] }
+      it "is passed into the Vagrantfile" do
+        subject.execute
+        expect(iso_env.vagrantfile.config.librarian_puppet.placeholder_filename).to eq(".PLACEHOLDER")
+      end
+
+      it "creates the modules directory and placeholder" do
+        subject.execute
+        expect(Dir.entries(iso_env.cwd)).to include("modules")
+        expect(Dir.entries(File.join(iso_env.cwd, "modules"))).to include(".PLACEHOLDER")
+      end
+
+      it "creates the Puppetfile" do
+        subject.execute
+        expect(Dir.entries(iso_env.cwd)).to include("Puppetfile")
+      end
+
+      it "contains the plugin" do
+        subject.execute
+        vagrantfile = File.readlines(File.join(iso_env.cwd, "Vagrantfile")).join
+        expect(vagrantfile).to include("vagrant-librarian-puppet")
+      end
+
+      describe "ui" do
+        let(:ui_class) { Vagrant::UI::Basic }
+        it "displays a .gitignore message" do
+          output = capture_stdout { subject.execute }
+          expect(output).to include(".gitignore")
+        end
+      end
+    end
+
+    describe "hiera" do
+      let(:argv) { ["--puppet", "--puppet-hiera"] }
+      it "is passed into the Vagrantfile" do
+        subject.execute
+        expect(iso_env.vagrantfile.config.vm.provisioners.first.config.hiera_config_path).to eq("hiera.yaml")
+      end
+
+      it "creates the file" do
+        subject.execute
+        expect(Dir.entries(iso_env.cwd)).to include("hiera.yaml")
+        expect(Dir.entries(iso_env.cwd)).to include("hiera")
+        expect(Dir.entries(File.join(iso_env.cwd, "hiera"))).to include("common.yaml")
+      end
+    end
   end
 
   context "winrm" do

data/templates/puppet/Puppetfile.erb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+forge "https://forgeapi.puppetlabs.com"
+
+# A module from the Puppet Forge
+# mod 'puppetlabs/stdlib'

data/templates/puppet/hiera.yaml.erb

@@ -0,0 +1,10 @@
+---
+:backends:
+- yaml
+
+:hierarchy:
+# - "node/%{::fqdn}"
+- "common"
+
+:yaml:
+:datadir: '/vagrant/hiera'

data/templates/vagrant/Vagrantfile.erb

@@ -16,7 +16,16 @@ Vagrant.configure("2") do |config|
   <% end -%>
   <% end -%>
   <% if provisioners.include? "puppet" -%>
+  <% if puppet_librarian_puppet -%>
+  config.librarian_puppet.placeholder_filename = ".PLACEHOLDER"
+  <% end -%>
   config.vm.provision "puppet" do |puppet|
+    <% if puppet_librarian_puppet -%>
+    puppet.module_path = 'modules'
+    <% end -%>
+    <% if puppet_hiera -%>
+    puppet.hiera_config_path = 'hiera.yaml'
+    <% end -%>
   end
   <% end -%>
   <% if communicator == "ssh" -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Christopher Baldauf
@@ -76,6 +76,9 @@ files:
 - spec/spec_helper.rb
 - spec/vagrant-orchestrate/command/init_spec.rb
 - spec/vagrant-orchestrate/command/root_spec.rb
+- templates/puppet/Puppetfile.erb
+- templates/puppet/hiera.yaml.erb
+- templates/puppet/hiera/common.yaml.erb
 - templates/vagrant/Vagrantfile.erb
 - vagrant-orchestrate.gemspec
 homepage: ''