teamd-installer 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5deb653d58f2e0ffde2d58c83d4daacdb021b5f
-  data.tar.gz: 82ba362357bfd45962fe2f2987a3258ef7de734e
+  metadata.gz: f02d805c542d4d113b188105614d3706f29f90eb
+  data.tar.gz: 5183d155fe6664af8a0af5480169ec424133ce2d
 SHA512:
-  metadata.gz: 7e9a44cf8a051d2dae29717bff601661ae052f4b705b4c577e232d9c69b60be7ee7bb25e4c9b8972cb92c76979b8b7baa5b8643b956709225f1082d9ad741bdd
-  data.tar.gz: 472d02efb180e00665685f2331c924f89f55a955cdeddd3a2cb30c08b20e3f38024e92696181212ce049ff1b591e9172ede750ce3de8568435dd6f98fbbf24ce
+  metadata.gz: 3b49f80cc865529a571b4d4d6fd121be3646ef72581d02b786fc0c59092897bf093b1f37f9cf3f8894713914aaade4f76d0ce03160510d4c1f4bcfc7b3dc36dc
+  data.tar.gz: 656c8406f433708aef78639c60de32d444b3e37e5b1fcc7f2ef948937f5e989db7725c8b8115054da16495b6711f43900ce76d3fa7b4fe416cf4d626c214fb87

data/docker/Dockerfile

@@ -4,6 +4,6 @@ MAINTAINER Mathias Kaufmann <me@stei.gr>
 RUN apk update && \
     apk add ruby ruby-dev ca-certificates bash wget gnupg util-linux coreutils bzip2 && \
     gem update --system --no-ri --no-rdoc
-RUN gem install --no-ri --no-rdoc --version 0.0.14 teamd-installer
+RUN gem install --no-ri --no-rdoc --version 0.0.15 teamd-installer
 
 ENTRYPOINT ["/usr/bin/teamd-installer"]

data/lib/teamd/installer/cli.rb

@@ -29,7 +29,7 @@ module Teamd
           Script.store options[:installer_script],@installer
           @disk,@major,@minor       = Disk.default
           Disk.create @disk, @major, @minor
-          File.write options[:command_file],[options[:installer_script],"-d",@disk,"-C",(ENV["GROUP"] || "stable"),"-c",options[:cloud_config]].join(" ")
+          File.write options[:installer_args_file],[options[:installer_script],"-d",@disk,"-C",(ENV["GROUP"] || "stable"),"-c",options[:cloud_config]].join(" ")
         end
       end
 
@@ -41,21 +41,21 @@ module Teamd
       method_option :installer_script, type: :string, default: "/tmp/installer"
       method_option :cloud_config, type: :string, default: "/tmp/user_data"
       method_option :reboot, type: :boolean, default: :true
-      method_option :command_file, type: :string, default: "/tmp/install_command"
+      method_option :installer_args_file, type: :string, default: "/tmp/install_args"
       def install
         Cli.build_cloud_config    options
         Cli.build_install_command options
-        Script.run [File.read(options[:command_file])]
+        Script.run [options[:installer_script],File.read(options[:installer_args_file])]
         Reboot.hard! if options[:reboot]
       end
 
       desc "prepare", "Write cloud-config to linked file and exit"
       method_option :etcd_discovery_id, type: :string
       method_option :cloud_config, type: :string, default: "/tmp/user_data"
-      method_option :command_file, type: :string, default: "coreos-install"
+      method_option :installer_args_file, type: :string, default: "/tmp/install_args"
       def prepare
         Cli.build_cloud_config options
-        File.write options[:command_file],"-c #{options[:cloud_config]} -d /dev/#{Disk.default[0]}"
+        File.write options[:installer_args_file],"-c #{options[:cloud_config]} -d /dev/#{Disk.default[0]}"
       end
     end
   end

data/lib/teamd/installer/version.rb

@@ -1,5 +1,5 @@
 module Teamd
   module Installer
-    VERSION = "0.0.14"
+    VERSION = "0.0.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamd-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Mathias Kaufmann