cloud-mu 3.1.1 → 3.1.2beta2

data/modules/mu/mu.yaml.rb

@@ -0,0 +1,282 @@
+# Configuration schema for mu.yaml. See also {https://github.com/cloudamatic/mu/wiki/Configuration the Mu wiki}.
+#
+# Example:
+#
+# <pre>
+#      ---    
+#      public_address: 1.2.3.4    
+#      mu_admin_email: egtlabs@eglobaltech.com    
+#      mu_admin_name: Joe Schmoe    
+#      mommacat_port: 2260    
+#      banner: My Example Mu Master    
+#      mu_repository: git://github.com/cloudamatic/mu.git    
+#      repos:    
+#      - https://github.com/cloudamatic/mu_demo_platform    
+#      allow_invade_foreign_vpcs: true    
+#      ansible_dir:    
+#      aws:    
+#        egtdev:    
+#          region: us-east-1    
+#          log_bucket_name: egt-mu-log-bucket    
+#          default: true    
+#          name: egtdev    
+#        personal:    
+#          region: us-east-2    
+#          log_bucket_name: my-mu-log-bucket    
+#          name: personal    
+#        google:    
+#          egtlabs:    
+#            project: egt-labs-admin    
+#            credentials_file: /opt/mu/etc/google.json    
+#            region: us-east4    
+#            log_bucket_name: hexabucket-761234    
+#            default: true    
+# </pre>
+module MuYAML
+	# The configuration file format for Mu's main config file.
+	# Amazon Web Services
+	class aws
+		# @!group Required parameters
+		
+		# **REQUIRED** - 
+		# S3 bucket into which we'll synchronize deploy secrets, and if we're hosted in AWS, collected system logs
+		#
+		# @return [String]
+		attr_accessor :log_bucket_name
+		# @!endgroup
+		# @!group Optional parameters
+		
+		# **Must match pattern `(?i-mx:^[a-z0-9]+$)`** - 
+		# Credentials used for accessing the AWS API (looks like: AKIAINWLOOAA24PBRBZA)
+		#
+		# @return [String]
+		attr_accessor :access_key
+		
+		# Credentials used for accessing the AWS API (looks like: +Z16iRP9QAq7EcjHINyEMs3oR7A76QpfaSgCBogp).
+		#
+		# @return [String]
+		attr_accessor :access_secret
+		
+		# **Must match pattern `(?-mix:^\d+$)`** - 
+		# Default target account for resources managed using these credentials. This is an AWS account number, e.g. 918972669773. If not specified, we will use the account number which owns these API keys.
+		#
+		# @return [String]
+		attr_accessor :account_number
+		
+		# A secure Chef vault and item from which to retrieve an AWS access key and secret. The vault item should have 'access_key' and 'access_secret' elements.
+		#
+		# @return [String]
+		attr_accessor :credentials
+		
+		# An INI-formatted AWS credentials file, of the type used by the AWS command-line tools. This is less secure than using 'credentials' to store these in a Chef vault. See: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html
+		#
+		# @return [String]
+		attr_accessor :credentials_file
+		
+		# **Default: `false`** - 
+		# If set to true, Mu will default to these AWS credentials when targeting AWS resources
+		#
+		# @return [Boolean]
+		attr_accessor :default
+		
+		# Default Amazon Web Services region in which these credentials should operate
+		#
+		# @return [String]
+		attr_accessor :region
+		# @!endgroup
+	end
+	# Microsoft Azure Cloud Computing Platform & Services
+	class azure
+		# @!group Optional parameters
+		
+		# App client id used to authenticate to our subscription. From https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredAppsPreview
+		#
+		# @return [String]
+		attr_accessor :client_id
+		
+		# App client secret used to authenticate to our subscription. From https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredAppsPreview under the 'Certificates & secrets' tab, 'Client secrets.' This can only be retrieved upon initial secret creation.
+		#
+		# @return [String]
+		attr_accessor :client_secret
+		
+		# JSON file which contains a hash of directory_id, client_id, client_secret, and subscription values. If found, these will be override values entered directly in mu-configure.
+		#
+		# @return [String]
+		attr_accessor :credentials_file
+		
+		# **Default: `false`** - 
+		# If set to true, Mu will use this set of Azure credentials when targeting Azure without a specific account having been requested
+		#
+		# @return [Boolean]
+		attr_accessor :default
+		
+		# AKA Tenant ID; the default Microsoft Azure Directory project in which we operate and deploy, from https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredAppsPreview
+		#
+		# @return [String]
+		attr_accessor :directory_id
+		
+		# **Default: `eastus`** - 
+		# Default Microsoft Azure region in which we operate and deploy
+		#
+		# @return [String]
+		attr_accessor :region
+		
+		# Default Microsoft Azure Subscription we will use to deploy, from https://portal.azure.com/#blade/Microsoft_Azure_Billing/SubscriptionsBlade
+		#
+		# @return [String]
+		attr_accessor :subscription
+		# @!endgroup
+	end
+	# Google Cloud Platform
+	class google
+		# @!group Required parameters
+		
+		# **REQUIRED** - 
+		# Cloud Storage bucket into which we'll synchronize deploy secrets, and if we're hosted in GCP, collected system logs
+		#
+		# @return [String]
+		attr_accessor :log_bucket_name
+		
+		# **REQUIRED** - 
+		# Default Google Cloud Platform project in which we operate and deploy. Generate a service account at: https://console.cloud.google.com/iam-admin/serviceaccounts/project, making sure the account has sufficient privileges to manage cloud resources. Download the private key as JSON, and import that key to the vault specified here. Import example: knife vault create secrets google -J my-google-service-account.json
+		#
+		# @return [String]
+		attr_accessor :project
+		# @!endgroup
+		# @!group Optional parameters
+		
+		# A secure Chef vault and item from which to retrieve the JSON-formatted Service Account credentials for our GCP account, in the format vault:itemname (e.g. 'secrets:google'). Generate a service account at: https://console.cloud.google.com/iam-admin/serviceaccounts/project, making sure the account has sufficient privileges to manage cloud resources. Download the private key as JSON, and import that key to the vault specified here. Import example: knife vault create secrets google -J my-google-service-account.json 
+		#
+		# @return [String]
+		attr_accessor :credentials
+		
+		# JSON-formatted Service Account credentials for our GCP account, b64-encoded and dropped directly into mu.yaml. Generate a service account at: https://console.cloud.google.com/iam-admin/serviceaccounts/project, making sure the account has sufficient privileges to manage cloud resources. Download the private key as JSON and point this argument to the file. This is less secure than using 'credentials' to store in a vault.
+		#
+		# @return [String]
+		attr_accessor :credentials_encoded
+		
+		# JSON-formatted Service Account credentials for our GCP account, stored in plain text in a file. Generate a service account at: https://console.cloud.google.com/iam-admin/serviceaccounts/project, making sure the account has sufficient privileges to manage cloud resources. Download the private key as JSON and point this argument to the file. This is less secure than using 'credentials' to store in a vault.
+		#
+		# @return [String]
+		attr_accessor :credentials_file
+		
+		# For Google Cloud projects which are attached to a GSuite domain. Some API calls (groups, users, etc) require this identifier. From admin.google.com, choose Security, the Single Sign On, and look for the Entity ID field. The value after idpid= in the URL there should be the customer ID.
+		#
+		# @return [String]
+		attr_accessor :customer_id
+		
+		# **Default: `false`** - 
+		# If set to true, Mu will use this set of GCP credentials when targeting the Google Cloud without a specific account having been requested
+		#
+		# @return [Boolean]
+		attr_accessor :default
+		
+		# For Google Cloud projects which are attached to a GSuite domain. GCP service accounts cannot view or manage GSuite resources (groups, users, etc) directly, but must instead masquerade as a GSuite user which has delegated authority to the service account. See also: https://developers.google.com/identity/protocols/OAuth2ServiceAccount#delegatingauthority
+		#
+		# @return [String]
+		attr_accessor :masequerade_as
+		
+		# **Default: `us-east4`** - 
+		# Default Google Cloud Platform region in which we operate and deploy
+		#
+		# @return [String]
+		attr_accessor :region
+		# @!endgroup
+	end
+	# @!group Required parameters
+	
+	# **REQUIRED**,
+	# **Must match pattern `(?i-mx:^[a-z0-9\-_]+$)`** - 
+	# The local system's value for HOSTNAME
+	#
+	# @return [String]
+	attr_accessor :hostname
+	
+	# **REQUIRED**,
+	# **Must match pattern `(?i-mx:\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z)`** - 
+	# Administative contact email
+	#
+	# @return [String]
+	attr_accessor :mu_admin_email
+	
+	# **REQUIRED**,
+	# **Must match pattern `(?-mix:^(127\.0\.0\.1|localhost)$)`** - 
+	# IP address or hostname
+	#
+	# @return [String]
+	attr_accessor :public_address
+	# @!endgroup
+	# @!group Optional parameters
+	
+	# If set to true, Mu will be allowed to modify routing and peering behavior of VPCs which it did not create, but for which it has permissions.
+	#
+	# @return [Boolean]
+	attr_accessor :allow_invade_foreign_vpcs
+	
+	# Intended for use with minimal installs which use Ansible as a groomer and which do not store Ansible artifacts in a dedicated git repository. This allows simply pointing to a local directory.
+	#
+	# @return [String]
+	attr_accessor :ansible_dir
+	
+	# Amazon Web Services
+	#
+	# @return [aws]
+	# @see aws
+	attr_accessor :aws
+	
+	# Microsoft Azure Cloud Computing Platform & Services
+	#
+	# @return [azure]
+	# @see azure
+	attr_accessor :azure
+	
+	# Login banner, displayed in various locations
+	#
+	# @return [String]
+	attr_accessor :banner
+	
+	# **Default: `false`** - 
+	# Disable the Momma Cat grooming daemon. Nodes which require asynchronous Ansible/Chef bootstraps will not function. This option is only honored in gem-based installations.
+	#
+	# @return [Boolean]
+	attr_accessor :disable_mommacat
+	
+	# Google Cloud Platform
+	#
+	# @return [google]
+	# @see google
+	attr_accessor :google
+	
+	# Optional extra Chef roles or recipes to invoke when running chef-client on this Master (ex: recipe[mycookbook::mumaster])
+	#
+	# @return [Array<String>]
+	attr_accessor :master_runlist_extras
+	
+	# **Default: `2260`**,
+	# **Must match pattern `(?i-mx:^[0-9]+$)`** - 
+	# Listen port for the Momma Cat grooming daemon
+	#
+	# @return [String]
+	attr_accessor :mommacat_port
+	
+	# **Default: `Mu Administrator`** - 
+	# Administative contact's full name
+	#
+	# @return [String]
+	attr_accessor :mu_admin_name
+	
+	# **Default: `git://github.com/cloudamatic/mu.git`**,
+	# **Must match pattern `(?-mix:(((git|ssh|http(s)?)|(git@[\w\.]+))(:(\/\/)?))?([\w\.@\:\/\-~]+)(\.git)?(\/)?)`** - 
+	# Source repository for Mu tools
+	#
+	# @return [String]
+	attr_accessor :mu_repository
+	
+	# **Default: `["https://github.com/cloudamatic/mu_demo_platform"]`**,
+	# **Must match pattern `(?-mix:(((git|ssh|http(s)?)|(git@[\w\.]+))(:(\/\/)?))?([\w\.@\:\/\-~]+)(\.git)?(\/)?)`** - 
+	# Optional platform repositories, as a Git URL or Github repo name (ex: eGT-Labs/fema_platform.git)
+	#
+	# @return [Array<String>]
+	attr_accessor :repos
+	# @!endgroup
+end

data/modules/mu.rb

@@ -644,7 +644,10 @@ module MU
     if !@@mu_public_addr.match(/^\d+\.\d+\.\d+\.\d+$/)
       hostname = IO.readlines("/etc/hostname")[0].gsub /\n/, ''
 
-      @@mu_public_ip = File.open('/etc/hosts').grep(/.*#{hostname}.*/).first.match(/^\d+\.\d+\.\d+\.\d+/)[0]
+      hostlines = File.open('/etc/hosts').grep(/.*#{hostname}.*/)
+      if hostlines and !hostlines.empty?
+        @@mu_public_ip = hostlines.first.match(/^\d+\.\d+\.\d+\.\d+/)[0]
+      end
     else
       @@mu_public_ip = @@mu_public_addr
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2beta2
 platform: ruby
 authors:
 - John Stange
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -291,14 +291,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.8
+        version: 0.36.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.8
+        version: 0.36.4
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +383,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: |+
   The eGTLabs Mu toolkit for unified cloud deployments. This gem contains the Mu deployment interface to cloud provider APIs. It will generate a sample configuration the first time it is invoked.
 
@@ -390,30 +404,32 @@ description: |+
 
 email: eGTLabs@eglobaltech.com
 executables:
-- mu-gcp-setup
+- mu-upload-chef-artifacts
 - mu-load-config.rb
-- mu-self-update
-- mu-node-manage
-- mu-aws-setup
 - mu-azure-setup
+- mu-firewall-allow-clients
 - mu-gen-docs
-- mu-tunnel-nagios
-- mu-ssh
+- mu-gcp-setup
 - mu-gen-env
-- mu-configure
-- mu-momma-cat
-- mu-ansible-secret
-- mu-run-tests
-- mu-firewall-allow-clients
+- mu-azure-tests
 - mu-deploy
+- mu-node-manage
+- mu-cleanup
+- mu-ssh
+- mu-ansible-secret
+- mu-aws-setup
 - mu-user-manage
+- mu-self-update
 - mu-adopt
-- mu-upload-chef-artifacts
-- mu-cleanup
+- mu-momma-cat
+- mu-configure
+- mu-run-tests
+- mu-tunnel-nagios
 extensions: []
 extra_rdoc_files: []
 files:
 - Berksfile
+- Berksfile.lock
 - Dockerfile
 - Jenkinsfile
 - LICENSE.md
@@ -452,6 +468,7 @@ files:
 - bin/mu-ansible-secret
 - bin/mu-aws-setup
 - bin/mu-azure-setup
+- bin/mu-azure-tests
 - bin/mu-cleanup
 - bin/mu-configure
 - bin/mu-deploy
@@ -691,6 +708,7 @@ files:
 - cookbooks/mu-tools/files/centos/etc/security/limits.conf
 - cookbooks/mu-tools/files/centos/etc/sysconfig/init
 - cookbooks/mu-tools/files/centos/etc/sysctl.conf
+- cookbooks/mu-tools/files/default/Mu_CA.pem
 - cookbooks/mu-tools/files/default/PSWindowsUpdate.zip
 - cookbooks/mu-tools/files/default/ebs_snapshots.py
 - cookbooks/mu-tools/files/default/etc/BANNER
@@ -954,6 +972,7 @@ files:
 - modules/mu/clouds/google/database.rb
 - modules/mu/clouds/google/firewall_rule.rb
 - modules/mu/clouds/google/folder.rb
+- modules/mu/clouds/google/function.rb
 - modules/mu/clouds/google/group.rb
 - modules/mu/clouds/google/habitat.rb
 - modules/mu/clouds/google/loadbalancer.rb
@@ -1014,6 +1033,7 @@ files:
 - modules/mu/groomers/README.md
 - modules/mu/groomers/ansible.rb
 - modules/mu/groomers/chef.rb
+- modules/mu/kittens.rb
 - modules/mu/logger.rb
 - modules/mu/master.rb
 - modules/mu/master/README.md
@@ -1022,6 +1042,7 @@ files:
 - modules/mu/master/ssl.rb
 - modules/mu/mommacat.rb
 - modules/mu/monkey_patches/chef_knife_ssh.rb
+- modules/mu/mu.yaml.rb
 - modules/tests/README.md
 - modules/tests/application_attributes.inc
 - modules/tests/auto_scaling.inc
@@ -1109,11 +1130,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The eGTLabs Mu toolkit for unified cloud deployments