opskeleton 0.9.9 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4527e12e7195227b3a1e6196be5bcc73fd1bd14
-  data.tar.gz: 0b80916fb0d4088c32ec46985781d8caadb29dcf
+  metadata.gz: 100c5f2c4fd500b55cfbc38f5bc62c6e6b0e1e2a
+  data.tar.gz: 8ca991fbefa5ce6b90165257280c46b9dc3d42f6
 SHA512:
-  metadata.gz: 384af8c4b51c63cca1d3437c1a3004838727ee211b66bbecd58a3d7c4570f6d35422de8b1988a842aa0fdbe732aacd5ef6bc6a8438200a6565b777d22cab5416
-  data.tar.gz: f296b30e181976539c91e59f4c86de5c11eaf6347faa97d6199a2dfda8bf18070ba7636c2491da5e9b2e3e9e456b57940cd88f64e1e10abe6c055a75c9f527bc
+  metadata.gz: 022a2837f813344b86ee50e5f7b526d0a070b7b73778ce6965f7564c053eff9a073a91544099d7154d8572061209338f56e547ff3601ca59b5b9f0d33b813a2c
+  data.tar.gz: 76b9bad8a04efd9bebe2d6d471c48ceebea39945c1c75bb1f9decb3da64a4fa778d5fbef7a6643abb047d554935543eb82fb9b6b644b595c826bdbd8fc342b5e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.9.9)
+    opskeleton (0.10.1)
       aws-sdk (~> 2)
       bintray_deploy
       git
@@ -12,39 +12,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    asciidoctor (1.5.5)
-    aws-sdk (2.7.3)
-      aws-sdk-resources (= 2.7.3)
-    aws-sdk-core (2.7.3)
+    asciidoctor (1.5.6.1)
+    aws-sdk (2.10.82)
+      aws-sdk-resources (= 2.10.82)
+    aws-sdk-core (2.10.82)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.3)
-      aws-sdk-core (= 2.7.3)
-    aws-sigv4 (1.0.0)
+    aws-sdk-resources (2.10.82)
+      aws-sdk-core (= 2.10.82)
+    aws-sigv4 (1.0.2)
     bintray_deploy (0.0.4)
       configuration
       rest-client
       thor
-    builder (3.2.3)
-    coderay (1.1.1)
+    coderay (1.1.2)
     configuration (1.3.4)
     diff-lcs (1.3)
-    domain_name (0.5.20161129)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    facter (2.4.6)
+    facter (2.5.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.17)
+    faraday_middleware (0.10.1)
+      faraday (>= 0.7.4, < 1.0)
+    fast_gettext (1.1.0)
+    ffi (1.9.18)
     formatador (0.2.5)
+    gettext (3.2.4)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext-setup (0.28)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2)
+      locale
     git (1.3.0)
     git_clone_url (1.0.1)
       uri-ssh_git (>= 1.0, < 2.0)
@@ -58,111 +58,105 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-minitest (2.4.4)
+    guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
     guard-shell (0.7.1)
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
-    her (0.6.8)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      faraday (~> 0.8)
-      multi_json (~> 1.7)
-    hiera (1.3.4)
-      json_pure
+    hiera (3.4.2)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.7.0)
     jmespath (1.3.1)
-    json (1.8.3)
-    json_pure (2.0.3)
+    json_pure (1.8.6)
     librarian-puppet (2.1.0)
       librarianp (>= 0.5.1)
       puppet_forge
       rsync
-    librarianp (0.6.3)
+    librarianp (0.6.4)
       thor (~> 0.15)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    lumberjack (1.0.11)
+    locale (2.1.2)
+    lumberjack (1.0.12)
     metaclass (0.0.4)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    minitest (5.10.1)
-    mocha (1.1.0)
+    minitar (0.6.1)
+    minitest (5.10.3)
+    mocha (1.3.0)
       metaclass (~> 0.0.1)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     multipart-post (2.0.0)
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.0.1)
+    net-ssh (4.2.0)
     netrc (0.11.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    posix-spawn (0.3.11)
-    pry (0.10.4)
+    pry (0.11.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    puppet (3.8.7)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
-      json_pure
-    puppet-lint (2.1.0)
-    puppet-syntax (2.2.0)
+      method_source (~> 0.9.0)
+    puppet (4.10.8)
+      facter (> 2.0, < 4)
+      gettext-setup (>= 0.10, < 1)
+      hiera (>= 2.0, < 4)
+      json_pure (~> 1.8)
+      locale (~> 2.1)
+    puppet-lint (2.3.3)
+    puppet-syntax (2.4.1)
       rake
-    puppet_forge (1.0.5)
-      her (~> 0.6.8)
-    puppetlabs_spec_helper (0.10.3)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec-puppet
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rest-client (2.0.0)
+    puppet_forge (2.2.8)
+      faraday (~> 0.9.0)
+      faraday_middleware (>= 0.9.0, < 0.11.0)
+      gettext-setup (~> 0.11)
+      minitar
+      semantic_puppet (~> 1.0)
+    puppetlabs_spec_helper (2.4.0)
+      mocha (~> 1.0)
+      puppet-lint (~> 2.0)
+      puppet-syntax (~> 2.0)
+      rspec-puppet (~> 2.0)
+    pygments.rb (1.2.0)
+      multi_json (>= 1.0.0)
+    rake (12.2.1)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-puppet (2.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-puppet (2.6.9)
       rspec
-    rspec-support (3.5.0)
+    rspec-support (3.7.0)
     rsync (1.0.9)
+    semantic_puppet (1.0.1)
+      gettext-setup (>= 0.3)
     shellany (0.0.1)
-    slop (3.6.0)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    text (1.3.1)
+    thor (0.20.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.4)
     uri-ssh_git (1.0.0)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
@@ -174,7 +168,7 @@ DEPENDENCIES
   guard-shell
   librarian-puppet (= 2.1.0)
   opskeleton!
-  puppet (= 3.8.7)
+  puppet (= 4.10.8)
   puppetlabs_spec_helper (>= 0.1.0)
   pygments.rb
   rspec-puppet

data/docs/doc.adoc

@@ -1,6 +1,6 @@
 = Opskeleton 
 Ronen Narkis, <narkisr@gmail.com>
-v0.9.2
+v0.9.9
 :toc: left
 :!numbered:
 :idseparator: -
@@ -81,7 +81,7 @@ $ make virtualbox/ubuntu1604
 A useful convention for Box names:
 
 ```bash
-ubuntu-{ubuntuversion}_puppet-3.6.1 ([os]-[version]_[provisioner]-[version])
+ubuntu-16.04_puppet-3.8.7 ([os]-[version]_[provisioner]-[version])
 ```
 
 == Puppet

data/lib/opskeleton/generate_puppet.rb

@@ -6,7 +6,7 @@ module Opsk
     argument :box, :type => :string, :desc => 'Vagrant box type'
     class_option :box_url, :type=> :string, :desc => 'vagrant box url'
     class_option :os_type, :type=> :string, :desc => 'Operating system type (bsd/linux)'
-    class_option :provider, :type=> :string, :desc => 'Vagrant provider be it virtualbox, openstack etc..', :default => 'virtualbox'
+    class_option :provider, :type=> :string, :desc => 'Vagrant provider be it virtualbox, openstack etc..', :default => 'libvirt'
     class_option :bench_enable, :type=> :boolean, :desc => 'Control if to enable benchmarking support'
 
     desc 'Generate a Vagrant, Puppet librarian and fpm project'
@@ -47,9 +47,9 @@ module Opsk
 	empty_directory("#{path}/static-modules/")
 	empty_directory("#{path}/manifests/")
 	template('templates/puppetfile.erb', "#{path}/Puppetfile")
-	template('templates/puppet/default.erb', "#{path}/manifests/default.pp")
+	copy_file('templates/puppet/default.pp', "#{path}/manifests/default.pp")
 	copy_file('templates/puppet/run.sh', "#{path}/run.sh")
-	copy_file('templates/puppet/boot.sh', "#{path}/boot.sh")
+	template('templates/puppet/boot.erb', "#{path}/boot.sh")
 	chmod("#{path}/run.sh", 0755)
 	chmod("#{path}/boot.sh", 0755)
     end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.9.9'
+  VERSION = '0.10.1'
 end

data/opskeleton.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('net-scp')
   gem.add_dependency('git')
   gem.add_dependency('git_clone_url', '~> 1.0')
-  gem.add_development_dependency('puppet','=3.8.7')
+  gem.add_development_dependency('puppet','=4.10.8')
   gem.add_development_dependency('rspec-puppet')
   gem.add_development_dependency('librarian-puppet', '= 2.1.0')
   gem.add_development_dependency('puppetlabs_spec_helper', '>= 0.1.0')

data/templates/hiera.yaml

@@ -1,10 +1,13 @@
 ---
-:backends:
- - yaml
- - module_data
-:logger: console
-:hierarchy:  
- - '%{::virtual}'
- - common
-:yaml:
-   :datadir: hieradata
+version: 5
+
+defaults:
+  datadir: /vagrant/hieradata-dev
+  data_hash: yaml_data
+hierarchy:
+ - name : 'virtual type'
+   path: "%{::virtual}.yaml"
+ - name : 'by hostname'
+   path: "%{::hostname}.yaml"
+ - name: 'common data'
+   path: 'common.yaml'

data/templates/puppet/{boot.sh → boot.erb}

@@ -1,4 +1,4 @@
 gem install bundle
 bundle install
 bundle exec librarian-puppet install
-vagrant up
+vagrant up <%=name%>

data/templates/puppet/default.pp

@@ -0,0 +1,3 @@
+node default {
+
+}

data/templates/puppet/vagrant.erb

@@ -1,50 +1,36 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-<%if(options['provider'].eql?('openstack')) -%>
-require 'vagrant-openstack-provider'
-<%end -%>
-
 Vagrant.configure("2") do |config|
 
   config.vm.define :<%=name%> do |node|
-<%if(options['provider'].eql?('virtualbox')) -%>
-    bridge = ENV['VAGRANT_BRIDGE']
-    bridge ||= 'eth0'
-<%end -%>
-
-    env  = ENV['PUPPET_ENV']
-    env ||= 'dev'
+    device = ENV['VAGRANT_BRIDGE']|| 'eth0'
 
 <%if(options['box_url']) -%>
-    <%="node.vm.box_url = '#{options['box_url']}'" -%> 
+    <%="node.vm.box_url = '#{options['box_url']}'" -%>
 <%end -%>
 <%if(options['provider'].eql?('virtualbox')) -%>
-    node.vm.box = '<%=box%>' 
-    node.vm.network :public_network, :bridge => bridge
+    node.vm.box = '<%=box%>'
+    node.vm.network :public_network, :bridge => device
     node.vm.hostname = '<%=name%>.local'
-  
+
     node.vm.provider :virtualbox do |vb|
       vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
     end
-<%elsif(options['provider'].eql?('openstack')) -%>
-    node.vm.box       = 'openstack'
-    node.ssh.username = 'ubuntu'
+<%elsif(options['provider'].eql?('libvirt')) -%>
+    pool = ENV['VAGRANT_POOL']
 
-    node.vm.provider :openstack do |os|
-      os.openstack_auth_url = 'http://hostname/tokens'
-      os.username           = config.configuration.os_username
-      os.password           = config.configuration.os_password
-      os.tenant_name        = ''
-      os.flavor             = 'm1.small'
-      os.image              = ''
-      os.floating_ip_pool   = ''
+    config.vm.provider :libvirt do |domain, override|
+       override.vm.network :public_network, :bridge => device , :dev => device
+       domain.uri = 'qemu+unix:///system'
+       domain.memory = 2048
+       domain.cpus = 2
+       domain.storage_pool_name = pool if pool
+       override.vm.synced_folder './', '/vagrant', type: 'nfs', nfs_udp: false, nfs_version: 4
     end
     <%end -%>
 
     node.vm.provision :puppet do |puppet|
       puppet.manifests_path = 'manifests'
       puppet.manifest_file  = 'default.pp'
-      puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml --environment=#{env}"
+      puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.10.1
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.7
+        version: 4.10.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.7
+        version: 4.10.8
 - !ruby/object:Gem::Dependency
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
@@ -284,8 +284,8 @@ files:
 - templates/parent/travis.erb
 - templates/puppet/Gemfile.erb
 - templates/puppet/Rakefile.erb
-- templates/puppet/boot.sh
-- templates/puppet/default.erb
+- templates/puppet/boot.erb
+- templates/puppet/default.pp
 - templates/puppet/docker/ubuntu_docker.erb
 - templates/puppet/opsk.yaml
 - templates/puppet/run.sh

data/templates/puppet/default.erb

@@ -1,3 +0,0 @@
-node '<%=name%>.local' {
-
-}