gogetit 0.22.1 → 0.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd003c220653968ff362c86fcdf82c096f7a6bb42cd7eef991a40fed9c6c982
-  data.tar.gz: 9186850f7546ad2229c899ed660c49f37d80f992fd3aa5205079f18ac6e8c438
+  metadata.gz: 5a4ad33d9e3ba2abd56517e7b492c6783ff9ffd3b5c31cacae0d9a4f08aca465
+  data.tar.gz: d0fd8947a53283a51888d5cbf348647c29d889fd8998b94d7692bd6f56e8e0d9
 SHA512:
-  metadata.gz: b4bad92eb03ed3db46df49cdacb340a71441c2233cd6e9805b3749686153b0a3ea5f80b9e51764fb15090d3b113ea205a8527894064d740d595317cf3042afaf
-  data.tar.gz: bd9bd694c8ac3f54d7f60c108cafa90949c07e15a799605e31df15a8e7c822b36e23cc04a0e2837680a3605f4f1ac39c8362bff5829098831e56e3f1c234547f
+  metadata.gz: 53fd56efeb9ec487cecc93736a502a8989c1c9c72b85144e712fc6b6313ab5b30eabfa0ee9d22bc69317a1e7cde4421041ce1cc6ad04f1ccf8bdaa7a94a97eb1
+  data.tar.gz: cbced91db630cee9cb53eebaba6e644392b44f8a33958b54a085f894c58709f50514eebac82a3470af425bfaecaf182275268e97d8abee1ea2d6b32b02dfe7e9

data/lib/gogetit/util.rb

@@ -265,11 +265,6 @@ module Gogetit
     def generate_cloud_init_config(options, config, user_data = {})
       logger.info("Calling <#{__method__.to_s}>")
 
-      # apt
-      user_data['apt'] = {}
-      # preserve source list for a while
-      user_data['apt']['preserve_sources_list'] = true
-
       if options[:'no-maas']
         # When there is no MAAS, containers should be able to resolve
         # their name with hosts file.
@@ -280,11 +275,11 @@ module Gogetit
       # https://cloudinit.readthedocs.io/en/latest/topics/examples.html
       # #configure-an-instances-trusted-ca-certificates
       #
-      if config[:cloud_init] && config[:cloud_init][:ca_certs]
+      if config[:cloud_init_helper] && config[:cloud_init_helper][:ca_certs]
         user_data['ca-certs'] = {}
         certs = []
 
-        config[:cloud_init][:ca_certs].each do |ca|
+        config[:cloud_init_helper][:ca_certs].each do |ca|
           content = get_http_content(ca)
           certs.push(
             /^-----BEGIN CERTIFICATE-----.*-/m.match(content).to_s
@@ -297,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] && config[:cloud_init][:ssh_ca_public_key]
+      if config[:cloud_init_helper] && config[:cloud_init_helper][:ssh_ca_public_key]
         user_data['write_files'] = []
-        content = get_http_content(config[:cloud_init][:ssh_ca_public_key][:key_url])
+        content = get_http_content(config[:cloud_init_helper][:ssh_ca_public_key][:key_url])
         if content
           file = {
             'content'     => content.chop!,
-            'path'        => config[:cloud_init][:ssh_ca_public_key][:key_path],
-            'owner'       => config[:cloud_init][:ssh_ca_public_key][:owner],
-            'permissions' => config[:cloud_init][:ssh_ca_public_key][:permissions]
+            '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]
           }
           user_data['write_files'].push(file)
           user_data['bootcmd'] = []
@@ -315,34 +310,24 @@ echo \"TrustedUserCAKeys #{file['path']}\" >> /etc/ssh/sshd_config"
           )
         end
 
-        if config[:cloud_init][:ssh_ca_public_key][:revocation_url]
-          content = get_http_content(config[:cloud_init][:ssh_ca_public_key][:revocation_url])
+        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 content
             user_data['bootcmd'].push(
               "cloud-init-per once download-key-revocation-list \
-curl -o #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]} \
-#{config[:cloud_init][:ssh_ca_public_key][:revocation_url]}"
+curl -o #{config[:cloud_init_helper][:ssh_ca_public_key][:revocation_path]} \
+#{config[:cloud_init_helper][:ssh_ca_public_key][:revocation_url]}"
             )
             user_data['bootcmd'].push(
               "cloud-init-per once ssh-user-key-revocation-list \
-echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\" \
+echo \"RevokedKeys #{config[:cloud_init_helper][:ssh_ca_public_key][:revocation_path]}\" \
 >> /etc/ssh/sshd_config"
             )
           end
         end
       end
 
-      # To add users
-      # https://cloudinit.readthedocs.io/en/latest/topics/examples.html
-      # #including-users-and-groups
-      if config[:cloud_init] && config[:cloud_init][:users]
-        user_data['users'] = []
-        user_data['users'].push('default')
-
-        config[:cloud_init][:users].each do |user|
-          user_data['users'].push(Hashie.stringify_keys user)
-        end
-      end
+      user_data.merge! (Hashie.stringify_keys config[:cloud_init])
 
       return user_data
     end

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.22.1"
+  VERSION = "0.22.6"
 end

data/lib/providers/lxd.rb

@@ -109,8 +109,8 @@ module Gogetit
 
         # physical device will be the gate device
         lxd_params[:config][:"user.network-config"]['config'].each do |iface|
-          if iface['type'] == "physical"
-            options[:ip_to_access] = iface['subnets'][0]['address'].split('/')[0]
+          if iface['type'] == 'physical'
+            config[:ip_to_access] = iface['subnets'][0]['address'].split('/')[0]
           end
         end
 
@@ -374,17 +374,21 @@ lxc.cgroup.devices.allow = b 7:* rwm"
       conn.start_container(name, :sync=>"true")
 
       if options[:'no-maas']
-        ip_or_fqdn = options[:ip_to_access]
+        ip_or_fqdn = config[:ip_to_access]
       else
         ip_or_fqdn = name + '.' + maas.get_domain
       end
 
-      if conn.execute_command(name, "ls /etc/lsb-release")[:metadata][:return] == 0
-        default_user = 'ubuntu'
-      elsif conn.execute_command(name, "ls /etc/redhat-release")[:metadata][:return] == 0
-        default_user = 'centos'
+      if config[:default][:user] == config[:cloud_init][:users][0]['name']
+          default_user = config[:default][:user]
       else
-        default_user = config[:default][:user]
+        if conn.execute_command(name, "ls /etc/lsb-release")[:metadata][:return] == 0
+          default_user = 'ubuntu'
+        elsif conn.execute_command(name, "ls /etc/redhat-release")[:metadata][:return] == 0
+          default_user = 'centos'
+        else
+          default_user = config[:default][:user]
+        end
       end
 
       lxd_params[:default_user] = default_user
@@ -393,7 +397,7 @@ lxc.cgroup.devices.allow = b 7:* rwm"
       logger.info("#{name} has been created.")
 
       if options[:'no-maas']
-        puts "ssh #{default_user}@#{options[:ip_to_access]}"
+        puts "ssh #{default_user}@#{config[:ip_to_access]}"
       else
         puts "ssh #{default_user}@#{name}"
       end

data/lib/sample_conf/gogetit.yml

@@ -56,6 +56,13 @@ chef:
       lxd: http://chef.example.com/install_chef_script_for_lxd.sh
 
 cloud_init:
+  apt:
+    primary:
+      - arches: [default]
+        uri: http://archive.ubuntu.com/ubuntu/
+    security:
+      - arches: [default]
+        uri: http://archive.ubuntu.com/ubuntu/
   users:
     - name: usera
       gecos: usera
@@ -63,6 +70,10 @@ cloud_init:
       groups: users, admin
       shell: /bin/bash
       lock_passwd: true
+      ssh_authorized_keys:
+        - ssh-rsa blahblahblah usera@desktop
+
+cloud_init_helper:
   ca_certs:
     - http://pki.example.com/site/root_ca.crt
   ssh_ca_public_key:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.6
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler