cheftacular 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762ef5692d31be7837a7650547269c06c510abbd
-  data.tar.gz: 1bdc839a22e03b37935c26430964bdf610e69895
+  metadata.gz: 3fff84acfdd06903b3e33c1106f34605608aa11c
+  data.tar.gz: ee853b823047510927ca0cac9f735cf2968079b3
 SHA512:
-  metadata.gz: 8d711abe36bb50ac08e7021bfe597fc1436cdedc4fbfba0c063bea93cfbe3efeb3fe01ac490e89fd10fbf84b4b4a0a7797074f16ccc7d56f0d5a6df8e3b3fd53
-  data.tar.gz: 5ee2d5ef64a6ffffb4059a134734dafbb6a1fadfb76c852bb07edcedcee1794685058eacab46b9b334611e4850dc68761496ce6464b14d3fc94830c61fd62f4d
+  metadata.gz: 563d2cb089d43b99091d727e8775ced547ea5627979a7d135ca074328c3d989d25031ea2b3388d2170448a7254475f849a8912e80a27edb319892e781dbfe8db
+  data.tar.gz: c1b78fd70bd6a4b82f148061632c3a347c9de72dd1b4b125ef990f4287f39610f63f85a802e3f88260c63720cf545536024304d1b9a0749226d7ee7dab438540

data/lib/cheftacular/README.md

@@ -41,9 +41,9 @@
 
 7.  `-R|--repository NAME` will make the command run against a specific repository or context (automatically set for application mode)
 
-8.  `-s|--search-node-name NODE_NAME` option will make this command return results that INCLUDE the NODE_NAME.
+8.  `-N|--search-node-name NODE_NAME` option will make this command return results that INCLUDE the NODE_NAME.
 
-9.  `-S|--search-role-name ROLE_NAME` option will make this command return results that INCLUDE the ROLE_NAME.
+9.  `-L|--search-role-name ROLE_NAME` option will make this command return results that INCLUDE the ROLE_NAME.
 
 10. `-E|--search-env-name ENV_NAME` option will make this command return results that have this environment.
 
@@ -80,7 +80,7 @@
 
     4. `load` will fetch the latest backup from the production primary **if it doesn't already exist on the server** and run the _backup loading command_ to load this backup into the env.
 
-    5. `restore` will simply just run the _backup loading command_ to load the latest backup onto the server.
+    5. `restore` will simply just run the _backup loading command_ to load the latest backup onto the server. This command is REPOSITORY SENSITIVE, to restore a repo other than default, you must use the -R REPOSITORY flag.
 
     6. `status` will display the current state of the backups
 
@@ -92,7 +92,7 @@
 
     2. If the all argument is provided, all repositories will be checked for the current environment
 
-    3. If the verify argument is provided, cft will attempt to see if the servers are using the latest commits
+    3. If the verify argument is provided, cft will attempt to see if the servers are using the latest commits. This is also aliased to `cft ch ve`
 
     4. Aliased to `cft ch`
 
@@ -174,11 +174,13 @@
 
     5. The `-v|--verbose` option will cause failed deploys to output to the terminal window and to their normal log file. Useful for debugging.
 
-    6. The `cft deploy check` argument will force a check run under the same environment as the initial deploy.
+    6. The `cft deploy check` argument will force a check run under the same environment as the initial deploy. This is also aliased to `cft d ch`
 
-    7. The `cft deploy verify` argument will force a check AND verify run under the same environment as the initial deploy
+    7. The `cft deploy verify` argument will force a check AND verify run under the same environment as the initial deploy. This is also aliased to `cft d ve`
 
-    8. Aliased to `cft d`
+    8. Deploy locks (if set in the cheftacular.yml for the repo(s)) can be bypassed with the `--override-deploy-locks` flag
+
+    9. Aliased to `cft d`
 
 12. `cft disk_report` will fetch useful statistics from every server for every environment and output it into your log directory.
 
@@ -196,7 +198,9 @@
 
     6. This command also accepts a *comma delimited list* of server names to boot / destroy instead of all the stored ones for an environment.
 
-    7. Aliased to `cft e`
+    7. This command works with all the flags that `cft deploy` works with, like -Z -z -O and so on.
+
+    8. Aliased to `cft e`
 
 14. `cft file NODE_NAME LOCATION_ALIAS MODE FILE_NAME` interacts with a file on the remote server
 
@@ -238,6 +242,8 @@
 
     1. This command runs on all servers in an environment by default
 
+    2. Packets can be examined more closely with `tcpdump src port PORT`
+
 17. `cft get_haproxy_log` this command will generate a haproxy html file for the load balancer(s) associated with a repository in the log directory. Opening this log file in the browser will show the status of that haproxy at the time of the log. 
 
     1. In devops mode, this command will not do anything without the -R repository passed.
@@ -302,7 +308,9 @@
 
     1. In the case of server creation, this command takes a great deal of time to execute. It will output what stage it is currently on to the terminal but <b>you must not kill this command while it is executing</b>.A failed build may require the server to be destroyed / examined by a DevOps engineer.
 
-29. `cft ssh NODE_NAME` ssh you into the node name you are trying to access. It will also drop the server's sudo password into your clipboard. 
+29. `cft ssh NODE_NAME [exec] [command]` ssh you into the node name you are trying to access. It will also drop the server's sudo password into your clipboard. 
+
+    1. `cft ssh NODE_NAME exec COMMAND` will execute a command on the server as root
 
 30. `cft tail [PATTERN_TO_MATCH]` will tail the logs (return continuous output) of the first node if finds that has an application matching the repository running on it. Currently only supports rails stacks
 
@@ -318,6 +326,8 @@
 
     1. This command is functionally the same as `cft check verify`.
 
+    2. This command is aliased to `cft ve`
+
 33. `cft version` this command prints out the current version of cheftacular.
 
     1. Aliased to `cft v`
@@ -535,7 +545,9 @@
 
     6. This command also accepts a *comma delimited list* of server names to boot / destroy instead of all the stored ones for an environment.
 
-    7. Aliased to `cft e`
+    7. This command works with all the flags that `cft deploy` works with, like -Z -z -O and so on.
+
+    8. Aliased to `cft e`
 
 20. `cft file NODE_NAME LOCATION_ALIAS MODE FILE_NAME` interacts with a file on the remote server
 
@@ -581,6 +593,8 @@
 
     1. This command runs on all servers in an environment by default
 
+    2. Packets can be examined more closely with `tcpdump src port PORT`
+
 24. `cft get_haproxy_log` this command will generate a haproxy html file for the load balancer(s) associated with a repository in the log directory. Opening this log file in the browser will show the status of that haproxy at the time of the log. 
 
     1. In devops mode, this command will not do anything without the -R repository passed.
@@ -679,7 +693,9 @@
 
     2. Remember, if you have auditing turned on in your cheftacular.yml, you can track who sends what to slack.
 
-44. `cft ssh NODE_NAME` ssh you into the node name you are trying to access. It will also drop the server's sudo password into your clipboard. 
+44. `cft ssh NODE_NAME [exec] [command]` ssh you into the node name you are trying to access. It will also drop the server's sudo password into your clipboard. 
+
+    1. `cft ssh NODE_NAME exec COMMAND` will execute a command on the server as root
 
 45. `cft test_env [TARGET_ENV] boot|destroy` will create (or destroy) the test nodes for a particular environment (defaults to staging, prod split-envs can be set with `-p`). Please read below for how TARGET_ENV works
 
@@ -703,11 +719,13 @@
 
     3. The argument `skip_update_tld` will stop the long process of checking and updating all the server domains _before_ cloudflare is updated. Only skip if you believe your domain info on your cloud is accurate.
 
-49. `cft update_cookbook [COOKBOOK_NAME] [INSTALL_VERSION]` allows you to specifically update a single cookbook
+49. `cft update_cookbook [COOKBOOK_NAME] [INSTALL_VERSION|local]` allows you to specifically update a single cookbook
 
     1. This command passed with no arguments will update TheCheftacularCookbook
 
-    2. Aliased to `cft uc`
+    2. If the 2nd argument is local, the command will drop a local version of the cookbook onto your chef-repo
+
+    3. Aliased to `cft uc`
 
 50. `cft update_split_branches` will perform a series of git commands that will merge all the split branches for your split_branch enabled repositories with what is currently on master and push them.
 
@@ -719,9 +737,13 @@
 
     4. This command will return a helpful error statement if you attempt to run the command with changes to your current working directory. You must commit these changes before running this command.
 
-51. `cft update_tld TLD` command will force a full dns update for a tld in the preferred cloud. It will ensure all the subdomain entries are correct (based on the contents of the addresses data bag) and update them if they are not. It will also create the local subdomain for the entry as well if it does exist and point it to the correct private address.
+51. `cft update_the_cheftacular_cookbook_and_knife_upload` update your local cheftacular cookbook with your local (out of chef-repo) cheftacular cookbook and knife_upload afterwards.
+
+    1. This method is aliased to `cft utccaku` and `cft utcc`.
+
+52. `cft update_tld TLD` command will force a full dns update for a tld in the preferred cloud. It will ensure all the subdomain entries are correct (based on the contents of the addresses data bag) and update them if they are not. It will also create the local subdomain for the entry as well if it does exist and point it to the correct private address.
 
-52. `cft upload_nodes` This command will resync the chef server's nodes with the data in our chef-repo/node_roles. 
+53. `cft upload_nodes` This command will resync the chef server's nodes with the data in our chef-repo/node_roles. 
 
     1. This command changes behavior depending on several factors about both your mode and the state of your environment
 
@@ -735,10 +757,10 @@
 
     4. Aliased to `cft un`
 
-53. `cft upload_roles` This command will resync the chef server's roles with the data in the chef-repo/roles.
+54. `cft upload_roles` This command will resync the chef server's roles with the data in the chef-repo/roles.
 
     1. Aliased to `cft ur`
 
-54. `cft version` this command prints out the current version of cheftacular.
+55. `cft version` this command prints out the current version of cheftacular.
 
     1. Aliased to `cft v`

data/lib/cheftacular/actions/console.rb

@@ -60,6 +60,7 @@ class Cheftacular
     def start_console_ruby_on_rails ip_address, run_list
       app_loc  = "#{ @config['cheftacular']['base_file_path'] }/#{ @options['repository'] }/current"
       true_env = @config['dummy_sshkit'].get_true_environment run_list, @config['cheftacular']['run_list_environments'][@options['env']], @options['env']
+      true_env = @config['dummy_sshkit'].get_override_environment @config['cheftacular']['repositories'][@options['role']], @options['env']
 
       #the >/dev/tty after the ssh block redirects the full output to stdout, not /dev/null where it normally goes  
       `ssh #{ Cheftacular::SSH_INLINE_VARS } -tt #{ @config['cheftacular']['deploy_user'] }@#{ ip_address } "cd #{ app_loc } && RAILS_ENV=#{ true_env } #{ @config['bundle_command'] } exec rails c" > /dev/tty`

data/lib/cheftacular/actions/deploy.rb

@@ -70,6 +70,8 @@ class Cheftacular
 
       @config['auditor'].notify_slack_on_completion_for_deploy(nodes.map {|n| n.name }, logs_bag_hash) if @config['cheftacular']['auditing'] && !@options['run_migration_already']
 
+      return false if @options['skip_further_deploy_steps']
+
       @config['action'].migrate(nodes) if @config['getter'].get_current_repo_config['database'] != 'none' && !@options['run_migration_already']
 
       split_nodes_hash = {}

data/lib/cheftacular/actions/log.rb

@@ -82,6 +82,7 @@ module SSHKit
       def start_log_fetch_ruby_on_rails name, ip_address, run_list, options, locs, cheftacular, passwords, out=""
         log_loc, timestamp  = set_log_loc_and_timestamp(locs)
         true_env            = get_true_environment run_list, cheftacular['run_list_environments'][options['env']], options['env']
+        true_env            = get_override_environment cheftacular['repositories'][options['role']], options['env']
         app_log_loc         = "#{ cheftacular['base_file_path'] }/#{ options['repository'] }/current/log"
         log_cmnd, log_lines = get_log_command_and_lines(options)
 

data/lib/cheftacular/actions/tail.rb

@@ -52,6 +52,7 @@ class Cheftacular
 
     def start_tail_ruby_on_rails ip_address, run_list, pattern_to_match
       true_env = @config['dummy_sshkit'].get_true_environment run_list, @config['cheftacular']['run_list_environments'][@options['env']], @options['env']
+      true_env = @config['dummy_sshkit'].get_override_environment @config['cheftacular']['repositories'][@options['role']], @options['env']
 
       #special servers should be listed first as most of them will have web role
       log_loc = "#{ @config['cheftacular']['base_file_path'] }/#{ @options['repository'] }/current/log/#{ true_env }.log"

data/lib/cheftacular/error.rb

@@ -15,7 +15,7 @@ class Cheftacular
 
       nodes = @config['parser'].exclude_nodes( nodes, exclusion_args, true )
 
-      raise "Node not found for #{ @options['node_name'] }" if nodes.empty?
+      raise "Node not found for node name: #{ @options['node_name'] }" if nodes.empty?
 
       nodes
     end

data/lib/cheftacular/file_system.rb

@@ -5,7 +5,7 @@ class Cheftacular
     end
 
     def log_directories
-      ['applog', 'deploy', 'failed-deploy', 'rolelog', 'rvm', 'server-setup', 'stashedlog']
+      ['applog', 'deploy', 'failed-deploy', 'rolelog', 'rvm', 'server-setup', 'stashedlog', 'server-update']
     end
 
     def write_version_file version

data/lib/cheftacular/helper.rb

@@ -315,7 +315,7 @@ class Cheftacular
 
         puts "Please re-run your deploy again and if this continues to not work, check with your DevOps personel!"
 
-        exit
+        @options['skip_further_deploy_steps'] = true
       elsif !git_output.include?(revision_to_check)
         puts "! The remote organization #{ org_name_to_check } does not have a revision / branch #{ revision_to_check } for repository: #{ @options['repository'] } !"
 

data/lib/cheftacular/stateless_actions/cloud_bootstrap_from_queue.rb

@@ -20,11 +20,11 @@ class Cheftacular
     def cloud_bootstrap_from_queue
       raise "This action is not meant to be called directly!" unless @options['in_scaling']
 
-      puts("Preparing to boot server #{ @options['node_name'] } for #{ @options['env'] }!") unless @options['quiet']
-
       @config['in_server_creation_queue'] = true
 
       @config['server_creation_queue'].each do |server_hash|
+        puts("Preparing to boot server #{ server_hash['node_name'] } for #{ @options['env'] }!") unless @options['quiet']
+
         puts("Creating server #{ server_hash['node_name'] } with arguments:") unless @options['quiet']
         ap(server_hash.except('node_name'))                                   unless @options['quiet']
 

data/lib/cheftacular/stateless_actions/environment.rb

@@ -100,15 +100,21 @@ class Cheftacular
 
           @options['unset_address_and_node_name'] = true
 
-          @config['action'].deploy
+          database_host = @config['parser'].exclude_nodes( @config['getter'].get_true_node_objects(true), [{ unless: "role[#{ @options['role'] }]"}, { if: { not_env: @options['env'] } }], true).first
+
+          unless database_host.nil?
+            @config['action'].deploy
+
+            backup_pid = Process.spawn("cft backups load --env=#{ @options['env'] }")
+          end
 
-          backup_pid = Process.spawn("cft backups load --env=#{ @options['env'] }")
+          puts("NOTE! This command is not finished until your terminal returns to an input state!") unless database_host.nil?
 
           @options['role'] = 'all'
 
           @config['action'].deploy
 
-          Process.wait backup_pid
+          Process.wait(backup_pid) unless database_host.nil?
 
           puts "Done loading data and setting up #{ @options['env'] }!"
         end
@@ -141,7 +147,9 @@ class Cheftacular
 
           sleep 15
         end
-      end  
+      end
+
+      @config['auditor'].notify_slack_on_completion("environment #{ type } command completed for env: #{ @options['env'] }\n") if @config['cheftacular']['auditing']
     end
 
     alias_method :e, :environment

data/lib/cheftacular/stateless_actions/server_update.rb

@@ -77,7 +77,7 @@ module SSHKit
 
         puts(out) if options['output'] || options['verbose']
 
-        ::File.open("#{ log_loc }/#{ name }-apt-update-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) } unless options['no_logs']
+        ::File.open("#{ log_loc }/server-update/#{ name }-apt-update-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) } unless options['no_logs']
 
         puts "Succeeded upgrade of #{ name } (#{ ip_address })"
 
@@ -89,7 +89,7 @@ module SSHKit
 
         out << sudo_capture( passwords[ip_address], 'shutdown', '1', '-r' )
 
-        ::File.open("#{ log_loc }/#{ name }-upgrade-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) }
+        ::File.open("#{ log_loc }/server-update/#{ name }-upgrade-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) }
 
         puts(out) if options['output'] || options['verbose']
 

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.15.0"
+  VERSION      = "2.15.1"
   RUBY_VERSION = "2.2.2"
 end

data/lib/sshkit/actions/start_task.rb

@@ -4,6 +4,7 @@ module SSHKit
       def start_task name, ip_address, run_list, command, options, locs, cheftacular, passwords, sudo=false, out=""
         log_loc, timestamp = set_log_loc_and_timestamp(locs)
         true_env = get_true_environment run_list, cheftacular['run_list_environments'][options['env']], options['env']
+        true_env = get_override_environment cheftacular['repositories'][options['role']], options['env']
 
         puts "Running #{ command } for #{ name } (#{ ip_address }) (Run with with --debug to generate a log as well)"
 

data/lib/sshkit/getters.rb

@@ -74,6 +74,18 @@ module SSHKit
 
         ret_hash
       end
+
+      def get_override_environment repo_hash, default_env
+        repo_hash['db_env_node_bypass'].each_pair do |original_env, original_env_hash|
+          next if default_env != original_env
+
+          default_env = original_env_hash['environment_to_bypass_into']
+
+          break
+        end
+
+        default_env
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie