gogetit 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223de42a595049a562c56526c1e49771e9e1a77e719cad4a723684789696275b
-  data.tar.gz: a02723085f655b501f07a97366cb7ddce9e336e8eed79ea793159cc3312967b4
+  metadata.gz: 4639acfdbff32bdcaf38e6b7300572aa51191fbaaaa44f4b4c1d37a549c83183
+  data.tar.gz: 8323c80277bd0cd70d319a1830859d48662afa83bcf575813349153d48dee8e6
 SHA512:
-  metadata.gz: 4e2caf0ffa211cd69aacdcbbd4dbbbed37188fefdc6a8736f68bcc46525f8e7397fb9dda8d36513c1150a51dfc33aedbdc87903922032893e940ff9e5a0332ef
-  data.tar.gz: 199a06a461a5bfa165282bd89cb8fb6f707999a02f89fe9a583196f7d0e222318ee97860aed8bde3edab81d45ac4cd067ffffc6a277b6f844e7fac565c65e40b
+  metadata.gz: 0d660f035aaf0a9886dac34a75c5b66ed386828d195ce0f44a0a392eb47f9ece4b546ea66897aed59ab7ebf01ded5a23862b8b6aad9cc3f160ef6244f3383649
+  data.tar.gz: e2a26f58a34c7dfe821895f58a0c3ccbb1d060b0090b8e90cf0578f0d5b10289a58427ea8e69f607796f6b46e7933704ccf4d7afa0a5313fbe560ea1a4f0523c

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.20.1"
+  VERSION = "0.20.2"
 end

data/lib/providers/libvirt.rb

@@ -192,54 +192,20 @@ module Gogetit
 
       logger.info("Calling to deploy...")
 
-      if options[:distro].nil? or options[:distro].empty?
-        distro = 'bionic'
-      else
-        distro = options[:distro]
-      end
-
-      maas.conn.request(:post, ['machines', system_id], \
-                        {'op' => 'deploy', 'distro_series' => distro})
-      maas.wait_until_state(system_id, 'Deployed')
-
-      fqdn = name + '.' + maas.get_domain
-      distro_name = maas.get_distro_name(system_id)
-      wait_until_available(fqdn, distro_name)
-
-      # To enable serial console to use 'virsh console'
-      if distro_name == 'ubuntu'
-        commands = [
-          'sudo systemctl enable serial-getty@ttyS0.service',
-          'sudo systemctl start serial-getty@ttyS0.service'
-        ]
-        run_through_ssh(fqdn, distro_name, commands)
-      end
-
-      logger.info("#{domain[:name]} has been created.")
-      puts "ssh #{distro_name}@#{name}"
-
-      domain[:default_user] = distro_name
-
-      { result: true, info: domain }
+      deploy(name, options)
     end
 
     def destroy(name)
       logger.info("Calling <#{__method__.to_s}>")
 
-      system_id = maas.get_system_id(name)
-
-      info = {}
-      info[:machine] = \
-        maas.conn.request(:get, ['machines', system_id])
-
-      if maas.machine_exists?(name)
-        if maas.get_machine_state(system_id) == 'Deployed'
-          logger.info("Calling to release...")
-          maas.conn.request(:post, ['machines', system_id], {'op' => 'release'})
-          maas.wait_until_state(system_id, 'Ready')
-        end
-        maas.conn.request(:delete, ['machines', system_id])
-      end
+      info = release(name)[:info]
+      maas.conn.request(
+        :delete,
+        [
+          'machines',
+          info[:machine]['system_id']
+        ]
+      )
 
       pools = []
       conn.list_storage_pools.each do |name|
@@ -313,18 +279,20 @@ module Gogetit
     def release(name)
       logger.info("Calling <#{__method__.to_s}>")
 
+      abort("Machine #{name} does not exist."\
+      " Please check both on MAAS and libvirt.") \
+        if not maas.machine_exists?(name)
+
       system_id = maas.get_system_id(name)
 
       info = {}
       info[:machine] = \
         maas.conn.request(:get, ['machines', system_id])
 
-      if maas.machine_exists?(name)
-        if maas.get_machine_state(system_id) == 'Deployed'
-          logger.info("Calling to release...")
-          maas.conn.request(:post, ['machines', system_id], {'op' => 'release'})
-          maas.wait_until_state(system_id, 'Ready')
-        end
+      if maas.get_machine_state(system_id) == 'Deployed'
+        logger.info("Calling to release...")
+        maas.conn.request(:post, ['machines', system_id], {'op' => 'release'})
+        maas.wait_until_state(system_id, 'Ready')
       end
 
       logger.info("#{name} has been released.")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Don Draper