canzea 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1b253d8bcadef43d741fa94d02ab7f6459e55b
-  data.tar.gz: 8cdbda655710f756b42f07e6aa4fd67b37416bb8
+  metadata.gz: d1a1fdb09688cd29d36e2d09d651c9fb89f13b1d
+  data.tar.gz: e220380fd5ee48d0ccbca5963eb4a1b472c6bb86
 SHA512:
-  metadata.gz: 6350e4c3b8ba82b72c5685d2317ad036b1663c0eeb23e8b518e4ea2e165b886f1641626a56b51d7981374548899060633b2fbf93b4cfa3351c1bf3b2393c31c2
-  data.tar.gz: b9d99a95d839850feb52e5b70f90f44cbd72d72063fda2a668f02359365cc4d774af51e45044237fa13af46b6c287a4bd5ac807b5a3cd92028c7fa04c3e220f5
+  metadata.gz: 6bf88fd9f812ce956b184038a66236e7c8a21bac03b2361a049cc5c9e3417dfd4069747152dc1c07f3926bac9abeb535b86cd81b753b290608aeb44ec915a427
+  data.tar.gz: 5110822e50b9d75fac3f04c25008a6ac6a4f8753908df88d78b3b848b3b1275d36cded90fed8bbdb052e699f0e1f3157861839dff04deaf1a4414a4f5c189f88

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.20"
+  VERSION = "0.1.21"
 end

data/lib/canzea.rb

@@ -12,6 +12,7 @@ require "template-runner"
 require "commands/config-git-commit"
 require "commands/get-catalog"
 require "commands/remote-run"
+require "commands/remote-bootstrap"
 require "commands/gen-user"
 
 module Canzea
@@ -126,13 +127,13 @@ module Canzea
         end
 
         if opts[:init]
-          publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{opts[:serverBase]}-#{opts[:serverNumber]}.json")
-          remote = RemoteCall.new
-          remote.init publicIp, opts[:privateKey]
+            publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{opts[:serverBase]}-#{opts[:serverNumber]}.json")
+            RemoteInit.new.do publicIp, opts[:privateKey]
         end
 
         if opts[:remote]
-            RemoteRun.new.do opts[:serverBase], opts[:serverNumber], opts[:privateKey], opts[:role], opts[:solution]
+            publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{opts[:serverBase]}-#{opts[:serverNumber]}.json")
+            RemoteRun.new.do publicIp, opts[:privateKey], opts[:role], opts[:solution]
         end
 
         if opts[:config_git_commit]

data/lib/commands/remote-bootstrap.rb

@@ -0,0 +1,32 @@
+require "git"
+require "fileutils"
+require "pathname"
+require "ssh-base-cmd-class"
+
+class RemoteInit
+    def init (publicIp, privateKey)
+        cmd1 = "yum -y install git"
+
+        cmd2 = "(rm -rf ike-environments && git clone https://gitlab.com/canzea/ecosystem-catalog.git)"
+
+        cmd3 = 'find /root/ike-environments -name "*.sh" -exec chmod +x {} +'
+
+        cmd4 = '(cd /root/ike-environments && ./roles/workarounds/ruby/install.sh)'
+        cmd5 = '(cd /root/ike-environments && ./roles/workarounds/ruby-gems/install.sh)'
+        cmd6 = '(cd /root/ike-environments && ./roles/workarounds/sshd/configure.sh)'
+        cmd7 = '(cd /root/ike-environments && ./roles/workarounds/sshd/enable.sh)'
+        cmd8 = '(cd /root/ike-environments && ./roles/workarounds/canzea/install-root.sh)'
+
+        remote = RemoteCall.new
+
+        remote.exec publicIp, privateKey, cmd1
+        remote.exec publicIp, privateKey, cmd2
+        remote.exec publicIp, privateKey, cmd3
+        remote.exec publicIp, privateKey, cmd4
+        remote.exec publicIp, privateKey, cmd5
+        remote.exec publicIp, privateKey, cmd6
+        remote.exec publicIp, privateKey, cmd7
+        remote.exec publicIp, privateKey, cmd8
+    end
+
+end

data/lib/commands/remote-run.rb

@@ -4,8 +4,7 @@ require "pathname"
 require "ssh-base-cmd-class"
 
 class RemoteRun
-    def do(serverBase, serverNumber, privateKey, role, solution)
-      publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{serverBase}-#{serverNumber}.json")
+    def do(publicIp, privateKey, role, solution)
       remote = RemoteCall.new
       remote.exec publicIp, privateKey, "canzea --lifecycle=install --role=#{role} --solution=#{solution}"
     end

data/lib/ssh-base-cmd-class.rb

@@ -5,29 +5,6 @@ require 'net/sftp'
 require 'json'
 
 class RemoteCall
-    def init (hostname, privateKey)
-        cmd1 = "yum -y install git"
-
-        cmd2 = "(rm -rf ike-environments && git clone https://IKE_CI:55665566@gitlab.com/ikethecoder/ike-environments.git)"
-
-        cmd3 = 'find /root/ike-environments -name "*.sh" -exec chmod +x {} +'
-
-        cmd4 = '(cd /root/ike-environments/environment/production && ./roles/workarounds/ruby/install.sh)'
-        cmd5 = '(cd /root/ike-environments/environment/production && ./roles/workarounds/ruby-gems/install.sh)'
-        cmd6 = '(cd /root/ike-environments/environment/production && ./roles/workarounds/sshd/configure.sh)'
-        cmd7 = '(cd /root/ike-environments/environment/production && ./roles/workarounds/sshd/enable.sh)'
-        cmd8 = '(cd /root/ike-environments/environment/production && ./roles/workarounds/canzea/install-root.sh)'
-
-        exec hostname, privateKey, cmd1
-        exec hostname, privateKey, cmd2
-        exec hostname, privateKey, cmd3
-        exec hostname, privateKey, cmd4
-        exec hostname, privateKey, cmd5
-        exec hostname, privateKey, cmd6
-        exec hostname, privateKey, cmd7
-        exec hostname, privateKey, cmd8
-    end
-
     def exec (hostname, privateKey, cmd)
 
         @username = "root"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Canzea Technologies
@@ -168,6 +168,7 @@ files:
 - lib/commands/config-git-commit.rb
 - lib/commands/gen-user.rb
 - lib/commands/get-catalog.rb
+- lib/commands/remote-bootstrap.rb
 - lib/commands/remote-run.rb
 - lib/helper-run-class.rb
 - lib/plan-step-class.rb