falkorlib 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f96b7e36009e31c6d9eed26df3617c53101bdcf
-  data.tar.gz: 3d8dc321a00e3592917e33650345c3aadab3fa6f
+  metadata.gz: a0f6ff47aab0020111d7405279aa40b72decc9f3
+  data.tar.gz: 3fde15f7cc813365b0cfabe7aa94e7d01741036c
 SHA512:
-  metadata.gz: 0203e66c8c90616d7e253f38f7e56e9f1c46638afdfb4f4224a5eb9e96d09024bdbbe42defbe13d00d276b7ec1079529d70bf7ebd34c5003d8ceffafee036459
-  data.tar.gz: 114dcd3403f15da7b3fc37c63e4597bc254c21e5a8d66fffffafc3028f33be80f3f54a09c70b8470c3d910c70b784b1c52749e884dbf8be0cbb5e1ef80cca9de
+  metadata.gz: d322a5ea7a88c93e42cbd2a08099d88353ec9d4e66ff2937a163b54bd94403104e9e477634990977b19769c999de117b7e1d4fae234aaf9a1531fa839da81f93
+  data.tar.gz: e9200caafecbeb305dc5eafdc045ffc957d8d28db4f0fa98af41e219a4d8a1dae0b5f1364b7d82e317e817cd0152c33e534d7ce2016d2c911c99fdf402b00706

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.7.14)
+    falkorlib (0.7.15)
       activesupport (~> 4.0)
       artii (>= 2.1)
       awesome_print (~> 1.2)

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Fri 2018-04-27 13:51 svarrette>
+# Time-stamp: <Fri 2018-04-27 16:58 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -118,7 +118,7 @@ module FalkorLib #:nodoc:
           :vagrant => {
             :os     => :centos7,
             :ram    => 1024,
-            :vcpus  => 4,
+            :vcpus  => 2,
             :domain => 'vagrant.dev',
             :range  => '10.10.1.0/24',
             :boxes => {

data/lib/falkorlib/bootstrap/vagrant.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Fri 2018-04-27 16:34 svarrette>
+# Time-stamp: <Fri 2018-04-27 16:56 svarrette>
 ################################################################################
 # Interface for Bootstrapping MkDocs
 #
@@ -47,13 +47,18 @@ module FalkorLib
       init_from_template(templatedir, rootdir, config,
                          :no_interaction => true,
                          :no_commit => true)
+      [ 'bootstrap.sh', 'config.yaml.sample' ].each do |f|
+        FalkorLib::Git.add(File.join(rootdir, 'vagrant', "#{f}")) if use_git
+      end
       Dir.chdir( rootdir ) do
         run %(git ignore '.vagrant/' )
         #   run %(ln -s README.md index.md )
       #   run %(ln -s README.md contributing/index.md )
       #   run %(ln -s README.md setup/index.md )
       end
-      exit_status.to_i
+      FalkorLib::Git.add(File.join(rootdir, '.gitignore')) if use_git
+
+      #exit_status.to_i
     end # vagrant
 
   end # module Bootstrap

data/lib/falkorlib/version.rb

@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
     # MAJOR: Defines the major version
     # MINOR: Defines the minor version
     # PATCH: Defines the patch version
-    MAJOR, MINOR, PATCH = 0, 7, 14
+    MAJOR, MINOR, PATCH = 0, 7, 15
 
     module_function
 

data/templates/vagrant/Vagrantfile.erb

@@ -1,6 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-# Time-stamp: <Fri 2018-04-27 16:31 svarrette>
+# Time-stamp: <Fri 2018-04-27 16:53 svarrette>
 ###########################################################################################
 #             __     __                          _    __ _ _
 #             \ \   / /_ _  __ _ _ __ __ _ _ __ | |_ / _(_) | ___
@@ -51,13 +51,13 @@ DEFAULT_SETTINGS = {
     :ram    => <%= config[:ram] %>,
     :vcpus  => <%= config[:vcpus] %>,
     :vbguest_auto_update => true,
+    :role   => 'default',
     # :nodes  => 1,
   },
   # Default domain settings
   :network => {
     :domain => '<%= config[:domain] %>',
     :range  => '<%= config[:range]  %>',
-    :client_ip_start_offset => 100,
   },
   # Default Boxes
   :boxes => {
@@ -72,7 +72,7 @@ DEFAULT_SETTINGS = {
   #   :os: <os>       # from the configured boxes
   #   :ram: <ram>
   #   :vcpus: <vcpus>
-  #   :role: <role>   # supported: [ 'controller', 'frontend' ]
+  #   :role: <role>   # supported: [ 'XX', 'YY' ]
   :vms => {
     # IF in single mode, below is the definition of the box to deploy
     'default' => {
@@ -150,6 +150,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     os    =    node[:os]       ? node[:os].to_sym : defaults[:os].to_sym
     ram   =    node[:ram]      ? node[:ram]       : defaults[:ram]
     vcpus =    node[:vcpus]    ? node[:vcpus]     : defaults[:vcpus]
+    role  =    node[:role]     ? node[:role]      : 'default'
     desc  =    node[:desc]     ? node[:desc]      : 'n/a'
 
     abort "Non-existing box OS '#{os}' for the VM '#{name}'" if  settings[:boxes][os.to_sym].nil?
@@ -168,6 +169,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         v.customize [ 'modifyvm', :id, '--cpus', vcpus.to_s ] if vcpus.to_i > 1
         #v.customize [ 'setextradata', :id, 'VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root', '1']
       end
+
+      # role specialization
+      if role == 'XX'
+        c.vm.provision "shell" do |s|
+          s.path = "scripts/XX_install.sh"
+          s.args = [ '--debug' ]
+          s.keep_color = true
+        end
+      end
     end
     __table[:rows] << [ name, fqdn, os.to_sym, "#{vcpus}/#{ram}", desc, ip]
   end  # settings

data/templates/vagrant/vagrant/config.yaml.sample

@@ -1,5 +1,5 @@
 # -*- mode: yaml; -*-
-# Time-stamp: <Mon 2018-01-22 08:20 svarrette>
+# Time-stamp: <Fri 2018-04-27 16:47 svarrette>
 ################################################################################
 # Complementary configuration for Vagrant
 # You can overwrite here the default settings defined in ../Vagrantfile and
@@ -11,9 +11,9 @@
 # Format:
 #   :<os><version>: <username>/<box> # see https://vagrantcloud.com
 # :boxes:
-#   :centos7: centos/7
-#   :debian8: debian/contrib-jessie64
-#   :ubuntu14: ubuntu/trusty64
+#   :centos7: 'centos/7'
+#   :debian8: 'debian/contrib-jessie64'
+#   :ubuntu14: 'ubuntu/trusty64'
 
 #_________________
 # Default settings
@@ -22,12 +22,6 @@
 #   :ram: 512             # Default RAM
 #   :vcpus: 1             # Default number of virtual CPUs
 #   :vbguest_auto_update: 1  # check/update box guest additions
-#   :nodes: 1             # Default number of compute nodes
-#                           also recomputed from partition config in cluster mode
-#   :mode: single         # Type of deployment. Eligible values:
-#                           'single' image or
-#                           'distributed' or
-#                           'cluster' (not yet implemented)
 
 #____________________
 # Network settings
@@ -49,101 +43,9 @@
 #   :role: <role>   # supported: [ 'controller', 'frontend' ]
 #
 # :vms:
-#   'slurm-backup':
-#     :hostname: slurm2
+#   'anothervm':
+#     :hostname: vm2
 #     :ram: 2048
 #     :vcpus: 2
-#     :desc: 'Slurm Controller #2 (backup)'
-#     :role: controller
-
-#_______________________________________________________________________
-# Default setting for the simulated compute nodes of the virtual cluster
-# :nodes:
-#   :cpus: 4
-#   :sockets: 2
-#   :ram: 512
-#   :realmemory: 400       # has to be reported to Slurm
-#   :cores_per_socket: 2
-#   :thread_per_core: 1
-#   :state: UNKNOWN
-
-#_______________________________________________________________________
-# The real part: Details of the Slurm Configuration
-# used later to feed slurm.conf from the ERB template
-# :slurm:
-#   :template: slurm.conf.erb
-#   :clustername: thor
-#   :allowgroups: clusterusers
-#   # Default Partition / QoS. Format:
-#   # '<name>':
-#   #     :nodes: n           # Number of nodes
-#   #     :default: true|false  # Default partition?
-#   #     :hidden: true|false  # Hidden partition?
-#   #     :allowgroups: 'ALL|group[,group]*'
-#   #     :allowaccounts: 'ALL|acct[,acct]*'
-#   #     :allowqos:'ALL|qos[,qos]*'
-#   #     :state: 'UP|DOWN|DRAIN|INACTIVE'
-#   #     :oversubscribe: 'EXCLUSIVE|FORCE|YES|NO' (replace :shared)
-#   #     #=== Time Format: minutes, minutes:seconds, hours:minutes:seconds, days-hours,
-#   #             days-hours:minutes, days-hours:minutes:seconds or "UNLIMITED"
-#   #     :default_time: 'UNLIMITED|DD-HH:MM:SS',
-#   #     :max_time:     'UNLIMITED|DD-HH:MM:SS'
-#   #     #=== associated QoS config, named 'qos-<partition>' ===
-#   #     :priority: n           # QoS priority (default: 0)
-#   #     :preempt: 'qos-<name>
-#   #
-#   :partitions:
-#     interactive:
-#       :nodes: 1
-#       :priority: 0
-#       :default_time: 0-10:00:00
-#       :max_time: 5-00:00:00
-#     batch:
-#       :nodes: 2
-#       :priority: 100
-#       :default: true
-#       :preempt: qos-interactive
-#       :default_time: 0-2:00:00
-#       :max_time: 5-00:00:00
-#   ### General options you may wish to customize
-#   :mpidefault: none
-#   :mpiparams: ''
-#   :topology: ''
-#   :mempercpu: 0
-#   :maxmempercpu: 0
-#   :slurmctlddebug: 3
-#   :slurmddebug: 3
-#   :slurmctldport: 6817
-#   :slurmdport: 6818
-#   :srunportrange: 50000-53000
-#   :jobsubmitplugins: ''   #'lua'
-#   # job completion logging mechanism type. You can use 'jobcomp/mysql'
-#   :jobcomptype: jobcomp/none
-#   :jobcomploc: ''
-#   # Health checker -- Ex: NHC / see https://github.com/mej/nhc
-#   :healthcheckprogram: ''
-#   :healthcheckinterval: 30
-#   # What level of association-based enforcement to impose on job submissions
-#   :acct_storageenforce: qos,limits,associations
-#   # type of scheduler to be use
-#   :schedulertype: sched/backfill
-#   # Plugin used to identify which jobs can be preempted in order to start a pending job
-#   :preempttype: preempt/qos
-#   :preemptmode: requeue
-#   # Plugin to be used in establishing a job's scheduling priority
-#   :prioritytype: priority/multifactor
-#   :prioritydecayHL: 5-0
-#   :priorityweightage: 0
-#   :priorityweightfairshare: 0
-#   :priorityweightjobsize: 0
-#   :priorityweightpartition: 0
-#   :priorityweightqos: 0
-#   # type of resource selection algorithm to be used
-#   :selecttype: select/cons_res
-#   :selecttype_params: CR_Core_Memory,CR_CORE_DEFAULT_DIST_BLOCK
-#   # type of task launch plugin, typically used to provide resource management within a node
-#   :taskplugin: task/cgroup
-#   :taskplugin_params: cpusets
-#   # hooks
-#   :taskprolog: '' # program to be execute prior to initiation of each task
-#   :taskepilog: '' # program to be execute after termination of each task
+#     :desc: 'VM #2 (secondary)'
+#     :role: role2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Sebastien Varrette