mommacat.rb in cloud-mu-3.1.5

- old
+ new

@@ -974,12 +974,19 @@
                     use_name = if (name.nil? or name.empty?)
                       if !dummy_ok
                         nil
                       elsif !mu_name.nil?
                         mu_name
+                      # AWS-style tags
+                      elsif descriptor.respond_to?(:tags) and
+                            descriptor.tags.is_a?(Array) and
+                            descriptor.tags.first.respond_to?(:key) and
+                            descriptor.tags.map { |t| t.key }.include?("Name")
+                        descriptor.tags.select { |t| t.key == "Name" }.first.value
                       else
                         try = nil
+                        # Various GCP fields
                         [:display_name, :name, (resourceclass.cfg_name+"_name").to_sym].each { |field|
                           if descriptor.respond_to?(field) and descriptor.send(field).is_a?(String)
                             try = descriptor.send(field)
                             break
                           end
@@ -1566,9 +1573,10 @@
 
       @node_cert_semaphore.synchronize {
         MU::Master::SSL.bootstrap
         sans = []
         sans << canonical_ip if canonical_ip
+        sans << resource.mu_name.downcase if resource.mu_name and resource.mu_name != cert_cn
         # XXX were there other names we wanted to include?
         key = MU::Master::SSL.getKey(cert_cn, keysize: keysize)
         cert, pfx_cert = MU::Master::SSL.getCert(cert_cn, "/CN=#{cert_cn}/O=Mu/C=US", sans: sans, pfx: is_windows)
         results[cert_cn] = [key, cert]
 