gogetit 0.22.7 → 0.22.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56768c5597c785d376b338f377fc5e4ed1e80513ada5c78bd1a2b8d766ebeaa6
-  data.tar.gz: 961f3621c7b86aa4f3f7f057994c61f4d3952038215395b489ba7fe57483f06b
+  metadata.gz: 3a6930d64b643d6e2dbc4e49957a6a89f6667abbbecf2b80519ceb2572ca334c
+  data.tar.gz: 99506b2526e06fd65dc9009719cb88855bb97ba07e796bc5e37309ff385dd6ee
 SHA512:
-  metadata.gz: f703dce8b2d9f0cb5ee54a6fec244aa32988e5c6e84ef1b5af86ceb9af09793c06e9e78aa149ed1c56749641b51d7db7b7ecdebe785af8a80c6c8dc199ad7292
-  data.tar.gz: c37784f2ff981c7a1c50008ddffb17bd3bb15d9d36312070aff9b93c4c1e37675b6ac75d6750b65fd4545b537fbd3ba79694e1fc4531358570a259ed141fc65a
+  metadata.gz: e18c2ffdcbc08b80164241af0f89844d758db902865d95a2418913ce2afc781fae0b09e1669ed1462e577c7ecc498b688b288dd1c6b7e53f7c9d746fd44ec867
+  data.tar.gz: c2b7b70114758503dc93a034f6f0803570e6e56dd721f4aeac6ff27e3e40e3833b8685492fb722cf8486eb0f7900fa2984ec99e658a28764bd2f519049a99d84

data/lib/gogetit/util.rb

@@ -292,15 +292,15 @@ module Gogetit
       # To get CA public key to be used for SSH authentication
       # https://cloudinit.readthedocs.io/en/latest/topics/examples.html
       # #writing-out-arbitrary-files
-      if config[:cloud_init_helper] && config[:cloud_init_helper][:ssh_ca_public_key]
+      if config[:cloud_init_helper] && config[:cloud_init_helper][:ssh_with_ca_signed_keys]
         user_data['write_files'] = []
-        content = get_http_content(config[:cloud_init_helper][:ssh_ca_public_key][:key_url])
+        content = get_http_content(config[:cloud_init_helper][:ssh_with_ca_signed_keys][:ca_public_key_url])
         if content
           file = {
             'content'     => content.chop!,
-            'path'        => config[:cloud_init_helper][:ssh_ca_public_key][:key_path],
-            'owner'       => config[:cloud_init_helper][:ssh_ca_public_key][:owner],
-            'permissions' => config[:cloud_init_helper][:ssh_ca_public_key][:permissions]
+            'path'        => config[:cloud_init_helper][:ssh_with_ca_signed_keys][:ca_public_key_path],
+            'owner'       => config[:cloud_init_helper][:ssh_with_ca_signed_keys][:owner],
+            'permissions' => config[:cloud_init_helper][:ssh_with_ca_signed_keys][:permissions]
           }
           user_data['write_files'].push(file)
           user_data['bootcmd'] = []
@@ -310,17 +310,17 @@ echo \"TrustedUserCAKeys #{file['path']}\" >> /etc/ssh/sshd_config"
           )
         end
 
-        if config[:cloud_init_helper][:ssh_ca_public_key][:revocation_url]
-          content = get_http_content(config[:cloud_init_helper][:ssh_ca_public_key][:revocation_url])
+        if config[:cloud_init_helper][:ssh_with_ca_signed_keys][:revocation_url]
+          content = get_http_content(config[:cloud_init_helper][:ssh_with_ca_signed_keys][:revocation_url])
           if content
             user_data['bootcmd'].push(
               "cloud-init-per once download-key-revocation-list \
-curl -o #{config[:cloud_init_helper][:ssh_ca_public_key][:revocation_path]} \
-#{config[:cloud_init_helper][:ssh_ca_public_key][:revocation_url]}"
+curl -o #{config[:cloud_init_helper][:ssh_with_ca_signed_keys][:revocation_path]} \
+#{config[:cloud_init_helper][:ssh_with_ca_signed_keys][:revocation_url]}"
             )
             user_data['bootcmd'].push(
               "cloud-init-per once ssh-user-key-revocation-list \
-echo \"RevokedKeys #{config[:cloud_init_helper][:ssh_ca_public_key][:revocation_path]}\" \
+echo \"RevokedKeys #{config[:cloud_init_helper][:ssh_with_ca_signed_keys][:revocation_path]}\" \
 >> /etc/ssh/sshd_config"
             )
           end

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.22.7"
+  VERSION = "0.22.10"
 end

data/lib/providers/libvirt.rb

@@ -277,8 +277,16 @@ module Gogetit
       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)
+
+      if config[:default][:user] == config[:cloud_init][:users][0]['name']
+        default_user = config[:default][:user]
+      else
+        default_user = distro_name
+      end
+
+      wait_until_available(fqdn, default_user)
 
       # To enable serial console to use 'virsh console'
       if distro_name == 'ubuntu'
@@ -286,15 +294,15 @@ module Gogetit
           'sudo systemctl enable serial-getty@ttyS0.service',
           'sudo systemctl start serial-getty@ttyS0.service'
         ]
-        run_through_ssh(fqdn, distro_name, commands)
+        run_through_ssh(fqdn, default_user, commands)
       end
 
       logger.info("#{name} has been created.")
-      puts "ssh #{distro_name}@#{name}"
+      puts "ssh #{default_user}@#{name}"
 
       info = {}
-      info[:distro] = distro
-      info[:default_user] = distro_name
+      info[:distro] = distro_name
+      info[:default_user] = default_user
 
       { result: true, info: info }
     end

data/lib/providers/lxd.rb

@@ -118,24 +118,25 @@ module Gogetit
           YAML.dump(lxd_params[:config][:"user.network-config"])[4..-1]
 
       elsif options[:ipaddresses]
-        options[:ifaces] = check_ip_available(options[:ipaddresses], maas)
+        config[:ifaces] = check_ip_available(options[:ipaddresses], maas)
         abort("There is no dns server specified for the gateway network.") \
-          unless options[:ifaces][0]['dns_servers'][0]
+          unless config[:ifaces][0]['dns_servers'][0]
         abort("There is no gateway specified for the gateway network.") \
-          unless options[:ifaces][0]['gateway_ip']
+          unless config[:ifaces][0]['gateway_ip']
 
         lxd_params[:config][:'user.network-config'] = {
           'version' => 1,
           'config' => [
             {
               'type' => 'nameserver',
-              'address' => options[:ifaces][0]['dns_servers'][0]
+              'address' => config[:ifaces][0]['dns_servers'][0],
+              'search' => maas.get_domain,
             }
           ]
         }
 
         # to generate configuration for [:config][:'user.network-config']['config']
-        options[:ifaces].each_with_index do |iface,index|
+        config[:ifaces].each_with_index do |iface,index|
           if index == 0
             iface_conf = {
               'type' => 'physical',
@@ -152,7 +153,7 @@ module Gogetit
               ]
             }
           elsif index > 0
-            if options[:ifaces][0]['vlan']['name'] != 'untagged'
+            if config[:ifaces][0]['vlan']['name'] != 'untagged'
               iface_conf = {
                 'type' => 'physical',
                 'name' => "eth#{index}",
@@ -166,7 +167,7 @@ module Gogetit
                   }
                 ]
               }
-            elsif options[:ifaces][0]['vlan']['name'] == 'untagged'
+            elsif config[:ifaces][0]['vlan']['name'] == 'untagged'
               iface_conf = {
                 'type' => 'vlan',
                 'name' => "eth0.#{iface['vlan']['vid'].to_s}",
@@ -215,7 +216,7 @@ module Gogetit
         lxd_params[:devices] = (Hashie.symbolize_keys lxd_params[:devices])
 
       elsif options[:ipaddresses]
-        options[:ifaces].each_with_index do |iface,index|
+        config[:ifaces].each_with_index do |iface,index|
           if index == 0
             if iface['vlan']['name'] == 'untagged' # or vid == 0
               lxd_params[:devices][:"eth#{index}"] = {
@@ -234,10 +235,10 @@ module Gogetit
                 type: 'nic'
               }
             end
-          # When options[:ifaces][0]['vlan']['name'] == 'untagged' and index > 0,
+          # When config[:ifaces][0]['vlan']['name'] == 'untagged' and index > 0,
           # it does not need to generate more devices 
           # since it will configure the IPs with tagged VLANs.
-          elsif options[:ifaces][0]['vlan']['name'] != 'untagged'
+          elsif config[:ifaces][0]['vlan']['name'] != 'untagged'
             lxd_params[:devices][:"eth#{index}"] = {
               mtu: iface['vlan']['mtu'].to_s,   #This must be string
               name: "eth#{index}",
@@ -291,7 +292,7 @@ module Gogetit
     def reserve_ips(name, options, container)
       logger.info("Calling <#{__method__.to_s}>")
       # Generate params to reserve IPs
-      options[:ifaces].each_with_index do |iface,index|
+      config[:ifaces].each_with_index do |iface,index|
         if index == 0
           params = {
             'subnet' => iface['cidr'],
@@ -304,14 +305,14 @@ module Gogetit
           # it fails ocuring '404 not found'.
           # if under score, '_', is used as a conjunction instead of '-',
           # it breaks MAAS DNS somehow..
-          if options[:ifaces][0]['vlan']['name'] == 'untagged'
+          if config[:ifaces][0]['vlan']['name'] == 'untagged'
             params = {
               'subnet' => iface['cidr'],
               'ip' => iface['ip'],
               'hostname' => 'eth0' + '-' + iface['vlan']['vid'].to_s  + '-' + name,
               'mac' => container[:expanded_config][:"volatile.eth0.hwaddr"]
             }
-          elsif options[:ifaces][0]['vlan']['name'] != 'untagged'
+          elsif config[:ifaces][0]['vlan']['name'] != 'untagged'
             params = {
               'subnet' => iface['cidr'],
               'ip' => iface['ip'],

data/lib/sample_conf/gogetit.yml

@@ -75,11 +75,11 @@ cloud_init:
 
 cloud_init_helper:
   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
+    - http://pki.example.com/site/ca-bundle.crt
+  ssh_with_ca_signed_keys:
+    ca_public_key_url: http://pki.example.com/site/ssh_ca.pub
+    ca_public_key_path: /etc/ssh/ssh_ca.pub
     revocation_url: http://pki.example.com/site/ssh-revoked-keys
-    revocation_path: /etc/ssh/ca.pub
+    revocation_path: /etc/ssh/ssh-revoked-keys
     owner: root:root
     permissions: '0640'

metadata

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