vagrant-junos_cli 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de8e0cec5ffa6a07787c3ea64d1104fb82319537
-  data.tar.gz: eb47ce35ad3852cd1cb3a216f1c0bb6e5dc66110
+  metadata.gz: d7290a4051b7190108477a6cc4c9ac17579bfccb
+  data.tar.gz: 4f65b37b7f98530114626587b485b5f0a2b65ad3
 SHA512:
-  metadata.gz: 7dedc9f20b2d49a667e57835deb7bbbf8d262950fab053f8e777634c4bdbf1e9909c7b76519f72474f20443a796afff2185539a7866cf3ec2fc519fc2477798a
-  data.tar.gz: 9a92b505bec6ce20b7d8f4c61ea08ef6705e910bc01cdc3bed78a10569fb74a9885cf48d8c4fdadd3118bc2aac99c983dd964dc161b740829f2aa1bbb74c672f
+  metadata.gz: b7faa8159b988739028958475901d3211bcf44bf0c1bc9ffccc047ded4497de83a86849da6df86283021d1b765fb54ff1cf47f2b2085e3f27e344b491084e1b5
+  data.tar.gz: 436510b8b418e016238fbeedf7fc76a67438cb3fcf91b5e4f556da6cf7d998e090ed2816b0c79e7a7b0efeae5bfde36865b7a3e44087239df07505e7d6aef450

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+## 1.0.1
+
+- Usage of quotes in the provisioning script has been fixed
+- Example and readme have been updated
+- Provisioning with root user has been fixed (vSRX)
+
+## 1.0.0
+
+- Initial implementation
+

data/README.md

@@ -50,7 +50,7 @@ Note the `provision.cmd` file, referenced in the provisioner.
 This is where your CLI commands should go.
 
 ```
-configure
+configure private
 set interfaces em3 unit 0 family inet address 10.0.0.1/24
 commit
 exit
@@ -61,5 +61,5 @@ Run `vagrant up` and the new box is getting created with the address configured.
 ## Configuration
 
 Junos CLI provisioner accepts most parameters available for the [Shell provisioner](https://www.vagrantup.com/docs/provisioning/shell.html).
-Do not pass `args`.
+Do not pass `args` or `env`.
 

data/example/provision.cmd

@@ -1,4 +1,4 @@
-configure
+configure private
   set interfaces em3 unit 0 family inet address 10.0.0.1/24
   show | compare
   commit

data/lib/vagrant/junos_cli/provisioner.rb

@@ -13,7 +13,7 @@ module Vagrant
       protected
 
       def provision_junos_cli
-        @machine.config.ssh.shell = 'start shell'
+        @machine.config.ssh.shell = 'start shell' unless @machine.config.ssh.username == 'root'
 
         with_script_file do |path|
           @machine.communicate.tap do |comm|
@@ -24,6 +24,12 @@ module Vagrant
               raise Vagrant::Errors::SSHNotReady if info.nil?
             end
 
+            user = info[:username]
+            comm.sudo("chown -R #{user} #{config.upload_path}",
+                      error_check: false)
+
+            comm.upload(path.to_s, config.upload_path)
+
             if config.name
               @machine.ui.detail(I18n.t('vagrant.provisioners.shell.running',
                                         script: "script: #{config.name}"))
@@ -41,12 +47,13 @@ if [ ! -d ~/.vagrant-junos_cli/bin ]; then\
   /bin/ln -s /bin/echo ~/.vagrant-junos_cli/bin/printf;\
   /bin/ln -s /bin/echo ~/.vagrant-junos_cli/bin/export;\
   /bin/echo setenv PATH \\~/.vagrant-junos_cli/bin:\\$PATH >> ~/.cshrc;\
-  source ~/.cshrc;\
 fi'"
 
-            cli_oneliner = format('/usr/sbin/cli -c "%s"', File.read(path).tr("\n", ';').gsub(/;+/, ';'))
+            cli_oneliner = "/usr/sbin/cli -f #{config.upload_path}"
+
+            clean_up = "/bin/rm #{config.upload_path}"
 
-            [prepare, cli_oneliner].each do |command|
+            [prepare, cli_oneliner, clean_up].each do |command|
               comm.execute(
                 command,
                 sudo: false,

data/lib/vagrant/junos_cli/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module JunosCli
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-junos_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mate Farkas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile