cloud-mu 3.0.0beta → 3.0.0

data/modules/mu/config/alarm.rb

@@ -248,6 +248,7 @@ module MU
           #  ok = false
           #end
         end
+        alarm["notification_endpoint"] ||= MU.muCfg['mu_admin_email']
         
         if alarm["dimensions"]
           alarm["dimensions"].each{ |dimension|

data/modules/mu/config/container_cluster.yml

@@ -5,7 +5,6 @@ instance_type: t2.medium
 instance_count: 4
 kubernetes:
   max_pods: 10
-instance_subnet_pref: all_public
 platform: centos
 # This stanza is optional; normal deployments to EKS might be done with kubectl
 # or through a CI tool such as GitLab

data/modules/mu/config/database.yml

@@ -11,14 +11,17 @@ auto_minor_version_upgrade: false
 backup_retention_period: 10
 cluster_node_count: 2
 create_cluster: true
+vpc:
+  vpc_name: <%= vpc_name %>
 create_read_replica: true
 master_user: Bob
 multi_az_on_create: true
-region: us-west-2
 
 <% else %> # IF NOT COMPLEX THEN ASSUME SIMPLE
 
 name: database-simple
+vpc:
+  vpc_name: <%= vpc_name %>
 size: <%= db_size %>
 engine: mariadb
 storage: 5

data/modules/mu/config/search_domain.yml

@@ -3,11 +3,12 @@
 name: searchdomain-complex
 instance_type: t2.small.elasticsearch
 instance_count: 4
-dedicated_masters: 1
+dedicated_masters: 3
 master_instance_type: t2.medium.elasticsearch
 zone_aware: true
-ebs_iops: 100
-ebs_type: gp2
+#ebs_iops: 100 # also has value restrictions, eesh
+#ebs_size: 35 # this is somehow locked to instance type
+#ebs_type: gp2
 elasticsearch_version: "6.2"
 advanced_options:
   "indices.query.bool.max_clause_count": 512

data/modules/mu/config/server.rb

@@ -146,9 +146,13 @@ module MU
             "default" => true
           },
           "groom" => {
-              "type" => "boolean",
-              "default" => true,
-              "description" => "Whether to run a host configuration agent, e.g. Chef, when bootstrapping"
+            "type" => "boolean",
+            "default" => true,
+            "description" => "Whether to run a host configuration agent, e.g. Chef, when bootstrapping"
+          },
+          "groomer_variables" => {
+            "type" => "object",
+            "description" => "Metadata variables to expose to Groomer clients, under a top-level key named +mu+. Same thing as +application_attributes+, but with a name that makes a modicum of sense."
           },
           "groomer_timeout" => {
               "type" => "integer",

data/modules/mu/config/server.yml

@@ -1,8 +1,11 @@
 <% if $complexity == 'complex' %>
 name: servercomplex
 size: <%= instance_type %>
-# TODO: BUILD OUT COMPLEX EXAMPLE
+vpc:
+  vpc_name: <%= vpc_name %>
 <% else %>
 name: serversimple
 size: <%= instance_type %>
+vpc:
+  vpc_name: <%= vpc_name %>
 <% end %>

data/modules/mu/config/server_pool.yml

@@ -1,6 +1,8 @@
 <% if $complexity == 'complex' %>
 name: <%= server_pools_name %>
 cloud: AWS
+vpc:
+  vpc_name: <%= vpc_name %>
 alarms:
 - comparison_operator: "GreaterThanThreshold"
   metric_name: "HTTPCode_Target_5XX_Count"

data/modules/mu/config/vpc.rb

@@ -417,8 +417,22 @@ module MU
 
         using_default_cidr = false
         if !vpc['ip_block']
-          using_default_cidr = true
-          vpc['ip_block'] = "10.0.0.0/16"
+          if configurator.updating and configurator.existing_deploy and
+             configurator.existing_deploy.original_config['vpcs']
+            pieces = []
+            configurator.existing_deploy.original_config['vpcs'].each { |v|
+              if v['name'] == vpc['name']
+                vpc['ip_block'] = v['ip_block']
+                break
+              elsif v['virtual_name'] == vpc['name']
+                vpc['ip_block'] = v['parent_block']
+                break
+              end
+            }
+          else
+            using_default_cidr = true
+            vpc['ip_block'] = "10.0.0.0/16"
+          end
         end
 
         # Look for a common YAML screwup in route table land
@@ -439,33 +453,34 @@ module MU
           rtb['routes'].uniq!
         }
 
-        # if we're peering with other on-the-fly VPCs who might be using
-        # the default range, make sure our ip_blocks don't overlap
         peer_blocks = []
-        my_cidr = NetAddr::IPv4Net.parse(vpc['ip_block'].to_s)
-        if vpc["peers"]
-          siblings = configurator.haveLitterMate?(nil, "vpcs", has_multiple: true)
+        siblings = configurator.haveLitterMate?(nil, "vpcs", has_multiple: true)
+        if siblings
           siblings.each { |v|
             next if v['name'] == vpc['name']
             peer_blocks << v['ip_block'] if v['ip_block']
           }
-          if peer_blocks.size > 0 and using_default_cidr
-            begin
-              have_overlaps = false
-              peer_blocks.each { |cidr|
-                sibling_cidr = NetAddr::IPv4Net.parse(cidr)
-                have_overlaps = true if my_cidr.rel(sibling_cidr) != nil
-              }
-              if have_overlaps
-                my_cidr = my_cidr.next_sib
-                my_cidr = nil if my_cidr.to_s.match(/^10\.255\./)
-              end
-            end while have_overlaps
-            if !my_cidr.nil? and vpc['ip_block'] != my_cidr.to_s
-              vpc['ip_block'] = my_cidr.to_s
-            else
-              my_cidr = NetAddr::IPv4Net.parse(vpc['ip_block'])
+        end
+
+        # if we're peering with other on-the-fly VPCs who might be using
+        # the default range, make sure our ip_blocks don't overlap
+        my_cidr = NetAddr::IPv4Net.parse(vpc['ip_block'].to_s)
+        if peer_blocks.size > 0 and using_default_cidr and !configurator.updating
+          begin
+            have_overlaps = false
+            peer_blocks.each { |cidr|
+              sibling_cidr = NetAddr::IPv4Net.parse(cidr.to_s)
+              have_overlaps = true if my_cidr.rel(sibling_cidr) != nil
+            }
+            if have_overlaps
+              my_cidr = my_cidr.next_sib
+              my_cidr = nil if my_cidr.to_s.match(/^10\.255\./)
             end
+          end while have_overlaps
+          if !my_cidr.nil? and vpc['ip_block'] != my_cidr.to_s
+            vpc['ip_block'] = my_cidr.to_s
+          else
+            my_cidr = NetAddr::IPv4Net.parse(vpc['ip_block'])
           end
         end
 
@@ -501,7 +516,7 @@ module MU
               vpc['peers'] << {
                 "vpc" => { "id" => MU.myVPC, "type" => "vpcs" }
               }
-            else
+            elsif !configurator.updating
               MU.log "#{vpc['ip_block']} overlaps with existing routes, will not be able to peer with Master's VPC", MU::WARN
             end
           end
@@ -513,6 +528,9 @@ module MU
           if !can_peer and have_public and vpc["create_bastion"]
             serverclass = Object.const_get("MU").const_get("Cloud").const_get(vpc["cloud"]).const_get("Server")
             bastion = serverclass.genericNAT.dup
+            bastion["groomer_variables"] = {
+              "nat_ip_block" => vpc["ip_block"].to_s
+            }
             bastion['name'] = vpc['name']+"-natstion" # XXX account for multiples somehow
             bastion['credentials'] = vpc['credentials']
             bastion['ingress_rules'] ||= []
@@ -522,11 +540,6 @@ module MU
                 "proto" => proto
               }
             }
-            bastion["application_attributes"] = {
-              "nat" => {
-                "private_net" => vpc["ip_block"].to_s
-              }
-            }
             bastion["vpc"] = {
               "name" => vpc["name"],
               "subnet_pref" => "public"

data/modules/mu/deploy.rb

@@ -137,11 +137,7 @@ module MU
         MU.log "Deployment id: #{MU.appname} \"#{MU.handle}\" (#{MU.deploy_id})"
       end
 
-      # Instance variables that are effectively class variables
-      @my_instance_id = MU::Cloud::AWS.getAWSMetaData("instance-id")
-      @my_az = MU::Cloud::AWS.getAWSMetaData("placement/availability-zone")
-
-      @fromName ='chef-server';
+      @fromName = MU.muCfg['mu_admin_email']
 
       MU::Cloud.resource_types.each { |cloudclass, data|
         if !@main_config[data[:cfg_plural]].nil? and @main_config[data[:cfg_plural]].size > 0
@@ -632,6 +628,17 @@ MESSAGE_END
                 end
                 myservice['#MUOBJECT'] ||= myservice["#MU_CLOUDCLASS"].new(mommacat: @mommacat, kitten_cfg: myservice, delayed_save: @updating)
               end
+            rescue RuntimeError => e
+              # cloud implementations can iterate over these same hashes,
+              # which can throw this if we catch them at the wrong moment.
+              # here's your hacky workaround.
+              if e.message.match(/can't add a new key into hash during iteration/)
+                MU.log e.message+" in main deploy thread, probably transient", MU::DEBUG
+                sleep 1
+                retry
+              else
+                raise e
+              end
             rescue Exception => e
               MU::MommaCat.unlockAll
               @main_thread.raise MuError, "Error instantiating object from #{myservice["#MU_CLOUDCLASS"]} (#{e.inspect})", e.backtrace

data/modules/mu/groomers/ansible.rb

@@ -268,7 +268,7 @@ module MU
         @server.describe(update_cache: true) # Make sure we're fresh
 
         allvars = {
-          "mu_deployment" => MU.structToHash(@server.deploy.deployment),
+          "mu_deployment" => MU::Config.stripConfig(@server.deploy.deployment),
           "mu_service_name" => @config["name"],
           "mu_canonical_ip" => @server.canonicalIP,
           "mu_admin_email" => $MU_CFG['mu_admin_email'],
@@ -301,6 +301,9 @@ module MU
         if !@config['application_attributes'].nil?
           groupvars["application_attributes"] = @config['application_attributes']
         end
+        if !@config['groomer_variables'].nil?
+          groupvars["mu"] = @config['groomer_variables']
+        end
 
         File.open(@ansible_path+"/group_vars/"+@server.config['name']+".yml", File::CREAT|File::RDWR|File::TRUNC, 0600) { |f|
           f.flock(File::LOCK_EX)

data/modules/mu/groomers/chef.rb

@@ -261,6 +261,10 @@ module MU
           chef_node.normal['application_attributes'] = @config['application_attributes']
           chef_node.save
         end
+        if !@config['groomer_variables'].nil?
+          chef_node.normal['mu'] = @config['groomer_variables']
+          chef_node.save
+        end
         if @server.deploy.original_config.has_key?('parameters')
           MU.log "Setting node:#{@server.mu_name} parameters", MU::DEBUG, details: @server.deploy.original_config['parameters']
           chef_node.normal['mu_parameters'] = @server.deploy.original_config['parameters']
@@ -461,7 +465,7 @@ module MU
 
           retries = 0
           begin
-            ssh = @server.getSSHSession(15)
+            ssh = @server.getSSHSession(25)
             Timeout::timeout(60) {
               if leave_ours
                 MU.log "Expunging pre-existing Chef install on #{@server.mu_name}, if we didn't create it", MU::NOTICE

data/modules/mu/kittens.rb

@@ -1,5 +1,7 @@
 ### THIS FILE IS AUTOMATICALLY GENERATED, DO NOT EDIT ###
-
+#
+#
+#
 module MU
 class Config
 	# The configuration file format for Mu application stacks.
@@ -201,7 +203,7 @@ class Config
 #
 # `AWS`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 #
-# `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+# `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 		class folders
 			# @!group Optional parameters
 			
@@ -358,7 +360,7 @@ class Config
 #
 # `AWS`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 #
-# `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+# `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 #
 # `Azure`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		class habitats
@@ -5105,6 +5107,13 @@ class Config
 			end
 		end
 	end
+	class BasketofKittens
+		class servers
+			# Metadata variables to expose to Groomer clients, under a top-level key named +mu+. Same thing as +application_attributes+, but with a name that makes a modicum of sense.
+			class groomer_variables
+			end
+		end
+	end
 	class BasketofKittens
 		class servers
 			# Tags to apply to this resource. Will apply at the cloud provider level and in node groomers, where applicable.
@@ -6622,6 +6631,12 @@ class Config
 			# @return [Boolean]
 			attr_accessor :groom
 			
+			# Metadata variables to expose to Groomer clients, under a top-level key named +mu+. Same thing as +application_attributes+, but with a name that makes a modicum of sense.
+			#
+			# @return [BasketofKittens::servers::groomer_variables]
+			# @see BasketofKittens::servers::groomer_variables
+			attr_accessor :groomer_variables
+			
 			# **Default: `1800`** - 
 			# Maximum execution time for a groomer run
 			#
@@ -7599,6 +7614,13 @@ class Config
 			end
 		end
 	end
+	class BasketofKittens
+		class server_pools
+			# Metadata variables to expose to Groomer clients, under a top-level key named +mu+. Same thing as +application_attributes+, but with a name that makes a modicum of sense.
+			class groomer_variables
+			end
+		end
+	end
 	class BasketofKittens
 		class server_pools
 			class alarms
@@ -9183,6 +9205,12 @@ class Config
 			# @return [Boolean]
 			attr_accessor :groom
 			
+			# Metadata variables to expose to Groomer clients, under a top-level key named +mu+. Same thing as +application_attributes+, but with a name that makes a modicum of sense.
+			#
+			# @return [BasketofKittens::server_pools::groomer_variables]
+			# @see BasketofKittens::server_pools::groomer_variables
+			attr_accessor :groomer_variables
+			
 			# **Default: `1800`** - 
 			# Maximum execution time for a groomer run
 			#
@@ -11555,6 +11583,14 @@ class Config
 			#
 			# @return [String]
 			attr_accessor :credentials
+			
+			# **AWS & CLOUDFORMATION ONLY** - 
+			#  +AWS+: Create a replication group; will be set automatically if +engine+ is +redis+ and +node_count+ is greated than one.
+			#
+			## +CLOUDFORMATION+: Create a replication group; will be set automatically if +engine+ is +redis+ and +node_count+ is greated than one.
+			#
+			# @return [Boolean]
+			attr_accessor :create_replication_group
 			# @!endgroup
 		end
 	end
@@ -14129,6 +14165,13 @@ class Config
 			end
 		end
 	end
+	class BasketofKittens
+		class container_clusters
+			# Metadata variables to expose to Groomer clients, under a top-level key named +mu+. Same thing as +application_attributes+, but with a name that makes a modicum of sense.
+			class groomer_variables
+			end
+		end
+	end
 	class BasketofKittens
 		class container_clusters
 			class alarms
@@ -16331,6 +16374,12 @@ class Config
 			# @return [Boolean]
 			attr_accessor :groom
 			
+			# Metadata variables to expose to Groomer clients, under a top-level key named +mu+. Same thing as +application_attributes+, but with a name that makes a modicum of sense.
+			#
+			# @return [BasketofKittens::container_clusters::groomer_variables]
+			# @see BasketofKittens::container_clusters::groomer_variables
+			attr_accessor :groomer_variables
+			
 			# **Default: `1800`** - 
 			# Maximum execution time for a groomer run
 			#
@@ -17330,14 +17379,14 @@ class Config
 			
 			# **AWS ONLY**,
 			# **Default: `7.1`** - 
-			#  +AWS+: A supported ElasticSearch version for the region of this SearchDomain. Known versions from : 7.1, 6.8, 6.7, 6.5, 6.4, 6.3, 6.2, 6.0, 5.6, 5.5, 5.3, 5.1, 2.3, 1.5
+			#  +AWS+: A supported ElasticSearch version for the region of this SearchDomain. Known versions from us-east-1: 7.1, 6.8, 6.7, 6.5, 6.4, 6.3, 6.2, 6.0, 5.6, 5.5, 5.3, 5.1, 2.3, 1.5
 			#
 			# @return [String]
 			attr_accessor :elasticsearch_version
 			
 			# **AWS ONLY**,
 			# **Default: `c5.large.elasticsearch`** - 
-			#  +AWS+: A supported ElasticSearch instance type for the region of this SearchDomain. Known types from : c5.large.elasticsearch, c5.xlarge.elasticsearch, c5.2xlarge.elasticsearch, c5.4xlarge.elasticsearch, c5.9xlarge.elasticsearch, c5.18xlarge.elasticsearch, i3.large.elasticsearch, i3.xlarge.elasticsearch, i3.2xlarge.elasticsearch, i3.4xlarge.elasticsearch, i3.8xlarge.elasticsearch, i3.16xlarge.elasticsearch, m5.large.elasticsearch, m5.xlarge.elasticsearch, m5.2xlarge.elasticsearch, m5.4xlarge.elasticsearch, m5.12xlarge.elasticsearch, r5.large.elasticsearch, r5.xlarge.elasticsearch, r5.2xlarge.elasticsearch, r5.4xlarge.elasticsearch, r5.12xlarge.elasticsearch, t2.small.elasticsearch, t2.medium.elasticsearch, c4.large.elasticsearch, c4.xlarge.elasticsearch, c4.2xlarge.elasticsearch, c4.4xlarge.elasticsearch, c4.8xlarge.elasticsearch, i2.xlarge.elasticsearch, i2.2xlarge.elasticsearch, m4.large.elasticsearch, m4.xlarge.elasticsearch, m4.2xlarge.elasticsearch, m4.4xlarge.elasticsearch, m4.10xlarge.elasticsearch, r4.large.elasticsearch, r4.xlarge.elasticsearch, r4.2xlarge.elasticsearch, r4.4xlarge.elasticsearch, r4.8xlarge.elasticsearch, r4.16xlarge.elasticsearch, m3.medium.elasticsearch, m3.large.elasticsearch, m3.xlarge.elasticsearch, m3.2xlarge.elasticsearch, r3.large.elasticsearch, r3.xlarge.elasticsearch, r3.2xlarge.elasticsearch, r3.4xlarge.elasticsearch, r3.8xlarge.elasticsearch.
+			#  +AWS+: A supported ElasticSearch instance type for the region of this SearchDomain. Known types from us-east-1: c5.large.elasticsearch, c5.xlarge.elasticsearch, c5.2xlarge.elasticsearch, c5.4xlarge.elasticsearch, c5.9xlarge.elasticsearch, c5.18xlarge.elasticsearch, i3.large.elasticsearch, i3.xlarge.elasticsearch, i3.2xlarge.elasticsearch, i3.4xlarge.elasticsearch, i3.8xlarge.elasticsearch, i3.16xlarge.elasticsearch, m5.large.elasticsearch, m5.xlarge.elasticsearch, m5.2xlarge.elasticsearch, m5.4xlarge.elasticsearch, m5.12xlarge.elasticsearch, r5.large.elasticsearch, r5.xlarge.elasticsearch, r5.2xlarge.elasticsearch, r5.4xlarge.elasticsearch, r5.12xlarge.elasticsearch, t2.small.elasticsearch, t2.medium.elasticsearch, c4.large.elasticsearch, c4.xlarge.elasticsearch, c4.2xlarge.elasticsearch, c4.4xlarge.elasticsearch, c4.8xlarge.elasticsearch, i2.xlarge.elasticsearch, i2.2xlarge.elasticsearch, m4.large.elasticsearch, m4.xlarge.elasticsearch, m4.2xlarge.elasticsearch, m4.4xlarge.elasticsearch, m4.10xlarge.elasticsearch, r4.large.elasticsearch, r4.xlarge.elasticsearch, r4.2xlarge.elasticsearch, r4.4xlarge.elasticsearch, r4.8xlarge.elasticsearch, r4.16xlarge.elasticsearch, m3.medium.elasticsearch, m3.large.elasticsearch, m3.xlarge.elasticsearch, m3.2xlarge.elasticsearch, r3.large.elasticsearch, r3.xlarge.elasticsearch, r3.2xlarge.elasticsearch, r3.4xlarge.elasticsearch, r3.8xlarge.elasticsearch.
 			#
 			# @return [String]
 			attr_accessor :instance_type
@@ -18113,7 +18162,7 @@ class Config
 #
 # `AWS`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
 #
-# `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+# `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 #
 # `Azure`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		class users
@@ -19499,7 +19548,7 @@ class Config
 #
 # `AWS`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
 #
-# `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+# `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 #
 # `Azure`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		class roles
@@ -20337,7 +20386,7 @@ class Config
 		##
 		## `AWS`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		##
-		## `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+		## `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 		#
 		# @return [Array<BasketofKittens::folders>]
 		# @see BasketofKittens::folders
@@ -20347,7 +20396,7 @@ class Config
 		##
 		## `AWS`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		##
-		## `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+		## `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 		##
 		## `Azure`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		#
@@ -20549,7 +20598,7 @@ class Config
 		##
 		## `AWS`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
 		##
-		## `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+		## `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 		##
 		## `Azure`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		#
@@ -20571,7 +20620,7 @@ class Config
 		##
 		## `AWS`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
 		##
-		## `Google`: This implementation is **BETA** quality. It is substantially complete, but may be missing some functionality or have some features which are untested.
+		## `Google`: This implementation is considered **RELEASE** quality. It covers all major API features and has been tested with real-world applications.
 		##
 		## `Azure`: This implementation is **ALPHA** quality. It is experimental, may be missing significant functionality, and has not been widely tested.
 		#