gogetit 0.13.7 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dda85aa5e421897de8d583ad71cdd238628da7c
-  data.tar.gz: a3f6b5950092f68d97dfdaf4b80b4af21da1140e
+  metadata.gz: '0069b408c8ca685e130a7e0d999dcada0260cd6d'
+  data.tar.gz: 823609fa164ac340398640d288ea7a186d398641
 SHA512:
-  metadata.gz: 40e6318c1fc413d2387c5acba16946c65b62a1cb061b0a9f4c99b673ec7fe07850bfebdeaa7358f9c1a0d3199dd203d60707de85153c84137d612e034a1d2fab
-  data.tar.gz: 379e92b58a605b12e73ab502a37478628318fa969ad0238517752761bd8ddde532357172819294b54cd6da20b92f8aa2c3a86ef1897bec66f5d121dfa501a290
+  metadata.gz: 40df33d8170177b3404c0aba7eb180624dd4d4f9a61ec656b557cf40ce2b6c2666a05cc443066cdeaad4bf4a6e94dc001ddcc215f763016a9bf9a249cbcc1878
+  data.tar.gz: c7821587c326c9ff112efb1d3cccd6a56c0bfe17409df63b60ef8e87e599d73a6e1cc0c5b4fb891bd061574a7b2bd89f09fa05f593b438783efbbdaea02fa85c

data/README.md

@@ -37,6 +37,9 @@ $ gem install gogetit --no-ri --no-rdoc
 ## Usage
 ```bash
 gogetit list
+gogetit list -out all
+gogetit list -o custom
+
 gogetit create lxd01
 gogetit create lxd01 --provider lxd
 

data/lib/gogetit.rb

@@ -16,4 +16,62 @@ module Gogetit
   @lxd = Gogetit::GogetLXD.new(config, maas, logger)
   @libvirt = Gogetit::GogetLibvirt.new(config, maas, logger)
 
+  def self.list_all_types
+    logger.debug("Calling <#{__method__.to_s}>")
+
+    nodes = []
+
+    # for LXD
+    conn = lxd.conn
+    config[:lxd][:nodes].each do |node|
+      puts "Listing LXC containers on #{node[:url]}..."
+
+      conn.containers.each do |con|
+        row = {}
+        row[:name] = conn.container(con).to_hash[:name]
+        row[:status] = conn.container_state(con).to_hash[:status].upcase
+        if conn.container_state(con).to_hash[:network] && \
+            conn.container_state(con).to_hash[:network][:eth0] && \
+            conn.container_state(con).to_hash[:network][:eth0][:addresses] && \
+            conn.container_state(con).to_hash[:network][:eth0][:addresses][0] && \
+            conn.container_state(con).to_hash[:network][:eth0][:addresses][0][:address]
+          row[:ipv4] = \
+            # only print the first IP address on the first interface
+            conn.container_state(con).to_hash[:network][:eth0][:addresses][0][:address]
+        else
+          row[:ipv4] = "NA"
+        end
+        row[:host] = node[:name]
+        row[:type] = 'LXC(LXD)'
+        nodes << row
+      end
+    end
+
+    # for Libvirt(KVM), machines in pods controlled by MAAS
+    conn = maas.conn
+    machines = conn.request(:get, ['machines'])
+    config[:libvirt][:nodes].each do |node|
+      puts "Listing KVM instances on #{node[:url]}..."
+      machines.each do |machine|
+        if machine['pod']['name'] == node[:name]
+          row = {}
+          row[:name] = machine['hostname']
+          row[:status] = machine['status_name']
+          if machine['interface_set'][0]['links'][0]['ip_address']
+            row[:ipv4] = machine['interface_set'][0]['links'][0]['ip_address']
+          else
+            row[:ipv4] = 'NA'
+          end
+          row[:host] = node[:name]
+          row[:type] = 'KVM(Libvirt)'
+          nodes << row
+        end
+      end
+    end
+
+    puts '-------------------------------------------------------------------------'
+    tp nodes, :name, :status, :ipv4, :host, :type
+    puts
+  end
+
 end

data/lib/gogetit/cli.rb

@@ -33,21 +33,23 @@ module Gogetit
     def list
       case options[:out]
       when 'custom'
-        lxd.list_all_containers
+        Gogetit.list_all_types
       when 'all'
         config[:lxd][:nodes].each do |node|
           puts "Listing LXD containers on #{node[:url]}.."
           system("lxc list #{node[:name]}:")
         end
+        puts "Listing KVM domains on #{config[:libvirt][:nodes][0][:url]}.."
+        system("virsh -c #{config[:libvirt][:nodes][0][:url]} list --all")
       when ''
         puts "Listing LXD containers on #{config[:lxd][:nodes][0][:url]}.."
         system("lxc list #{config[:lxd][:nodes][0][:name]}:")
         puts ''
+        puts "Listing KVM domains on #{config[:libvirt][:nodes][0][:url]}.."
+        system("virsh -c #{config[:libvirt][:nodes][0][:url]} list --all")
       else
         puts "Invalid option or command"
       end
-      puts "Listing KVM domains on #{config[:libvirt][:nodes][0][:url]}.."
-      system("virsh -c #{config[:libvirt][:nodes][0][:url]} list --all")
     end
 
     desc 'create NAME', 'Create either a container or KVM domain.'

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.13.7"
+  VERSION = "0.14.0"
 end

data/lib/providers/lxd.rb

@@ -20,42 +20,6 @@ module Gogetit
       @logger = logger
     end
 
-    def list_all_containers
-      logger.debug("Calling <#{__method__.to_s}>")
-
-      nodes = []
-      config[:lxd][:nodes].each do |node|
-        puts "Listing LXC containers on #{node[:url]}..."
-
-        conn = Hyperkit::Client.new(
-            api_endpoint: node[:url],
-            verify_ssl: false
-        )
-
-        conn.containers.each do |con|
-          row = {}
-          row[:name] = conn.container(con).to_hash[:name]
-          row[:status] = conn.container_state(con).to_hash[:status].upcase
-          if conn.container_state(con).to_hash[:network] && \
-              conn.container_state(con).to_hash[:network][:eth0] && \
-              conn.container_state(con).to_hash[:network][:eth0][:addresses] && \
-              conn.container_state(con).to_hash[:network][:eth0][:addresses][0] && \
-              conn.container_state(con).to_hash[:network][:eth0][:addresses][0][:address]
-            row[:ipv4] = \
-              # only print the first IP address on the first interface
-              conn.container_state(con).to_hash[:network][:eth0][:addresses][0][:address]
-          else
-            row[:ipv4] = "NA"
-          end
-          row[:host] = node[:name]
-          nodes << row
-        end
-      end
-      puts '-----------------------------------------------------------'
-      tp nodes, :name, :status, :ipv4, :host
-      puts
-    end
-
     def list
       logger.info("Calling <#{__method__.to_s}>")
       conn.containers

data/lib/sample_conf/gogetit.yml

@@ -2,24 +2,6 @@ default:
   user: ubuntu
   root_bridge: $root_bridge
 
-cloud_init:
-  users:
-    - name: usera
-      gecos: usera
-      sudo: ALL=(ALL) NOPASSWD:ALL
-      groups: users, admin
-      shell: /bin/bash
-      lock_passwd: true
-  ca_certs:
-    - http://pki.example.com/site/root_ca.crt
-  ssh_ca_public_key:
-    key_url: http://pki.example.com/site/ssh_ca.pub
-    key_path: /etc/ssh/ca.pub
-    revocation_url: http://pki.example.com/site/ssh-revoked-keys
-    revocation_path: /etc/ssh/ca.pub
-    owner: root:root
-    permissions: '0640'
-
 maas:
   key: K:E:Y
   url: http://maas.example.com/MAAS/api/2.0
@@ -72,3 +54,21 @@ chef:
     install_script: 
       libvirt: http://chef.example.com/install_chef_script.sh
       lxd: http://chef.example.com/install_chef_script_for_lxd.sh
+
+cloud_init:
+  users:
+    - name: usera
+      gecos: usera
+      sudo: ALL=(ALL) NOPASSWD:ALL
+      groups: users, admin
+      shell: /bin/bash
+      lock_passwd: true
+  ca_certs:
+    - http://pki.example.com/site/root_ca.crt
+  ssh_ca_public_key:
+    key_url: http://pki.example.com/site/ssh_ca.pub
+    key_path: /etc/ssh/ca.pub
+    revocation_url: http://pki.example.com/site/ssh-revoked-keys
+    revocation_path: /etc/ssh/ca.pub
+    owner: root:root
+    permissions: '0640'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.14.0
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler