fhcap-cli 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df6384b3f0a956ef606c3ce4543bdf5416501505
-  data.tar.gz: e468e58706453980ecde19e48309ff3f7eb0d0b8
+  metadata.gz: 7acbc771765e2bf82cb5755b32bb7631800182b3
+  data.tar.gz: cd859f19e646cf1ea6a2c4d43c5c0cd71030ed60
 SHA512:
-  metadata.gz: 32bbd3b888485117124bb672a68018f0a71212e799fe22ee94b0a6dbcb08654c60cefdb4c55734ded424171afc11fb2e49da49df773ad96e3a244c2cc20e2d82
-  data.tar.gz: cf572600c4a85f9e1f94c5711c9a40d1f1355f34831991ec6b6852493fdbf579c211711549db6b21e2580608a13ade2787cc915637b57477d4eaac9bae814918
+  metadata.gz: 26a99632444a62d7563339f8e4d1e785804030c6d1305043ca1ab1edeced32ce135ef3b26685cfca58b121961a91a43b881fa89a2456fdaa8d0107d6ec46bb32
+  data.tar.gz: 40aedf8f607a33e9e6009d07a1fdf770e305ec98d70271b3176f192e5209253bd79f126d87c55d72df1202f2f409c56ecf2a01a9048c4040ecba61ce17bdc4b1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 0.4.15
+
+* [RHMAP-17998] - Add remote-query option to provider add. Allows skipping querying the remote provider for config data.
+* [RHMAP-16288] - Expose cluster cookbook promote task as CLI method
+
 ## 0.4.14
 
 * [RHMAP-16161] - Adding S3 support for RHMAP component validation as part of list_artifacts task

data/lib/fhcap/cluster.rb

@@ -202,6 +202,17 @@ module Fhcap
         Tasks::Cluster::UpdateEnvironmentAttributes.new(task_options(options.dup)).run
       end
 
+      desc "promote_cookbooks", "[ADVANCED USAGE] Promote Chef environment cookbook versions "
+
+      shared_options :verbose
+
+      method_option 'name', :type => :string, :required => true, :desc => 'Cluster name'
+
+      def promote_cookbooks
+        require 'fhcap/tasks/cluster/promote_cookbooks'
+        Tasks::Cluster::PromoteCookbooks.new(task_options(options.dup)).run
+      end
+
     end
   end
 end

data/lib/fhcap/provider.rb

@@ -15,6 +15,7 @@ module Fhcap
       desc "add", "Add a provider"
 
       shared_options :verbose, :name, :type, :credentials, :interactive, :'provider-config'
+      method_option :'remote-query', :desc => 'Run remote query against provider to gather configuration data.', :type => :boolean, :required => false, :default => true
 
       def add
         require "fhcap/tasks/provider/add"

data/lib/fhcap/tasks/cluster/promote_cookbooks.rb

@@ -0,0 +1,17 @@
+require 'fhcap/tasks/cluster/cluster_task_base'
+require 'fhcap/tasks/chef/environments/promote_cookbooks'
+
+module Fhcap
+  module Tasks
+    module Cluster
+      class PromoteCookbooks < ClusterTaskBase
+
+        def run
+          thor.say "Cluster::PromoteCookbooks: name = #{name}", :yellow
+          Chef::Environments::PromoteCookbooks.new(@options.dup.merge({:environments => cluster_environments}.merge(chef_task_options))).run
+        end
+
+      end
+    end
+  end
+end

data/lib/fhcap/tasks/provider/add.rb

@@ -14,6 +14,7 @@ module Fhcap
 
         def initialize(options)
           super
+          @remote_query = options[:'remote-query']
           @options_provider_config = options[:'provider-config'] || {}
           @name = options[:name]
           @type = options[:type]
@@ -73,47 +74,48 @@ module Fhcap
         def aws_compute(cfg)
           creds = cfg[:credentials]
           cfg[:regions] = {}
-          ec2 = Aws::EC2::Client.new(
-              region: 'eu-west-1',
-              access_key_id: creds[:'aws-access-key'],
-              secret_access_key: creds[:'aws-secret-key']
-          )
-
-          resp = ec2.describe_regions
-          thor.say "Found #{resp.regions.length} regions for this AWS account: #{resp.regions.collect{|r|r.region_name}}"
-          resp.regions.each do |region|
-            thor.say "Configure #{region.region_name}", :yellow
+          if @remote_query
             ec2 = Aws::EC2::Client.new(
-                region: region.region_name,
+                region: 'eu-west-1',
                 access_key_id: creds[:'aws-access-key'],
                 secret_access_key: creds[:'aws-secret-key']
             )
 
-            resp = ec2.describe_images({
-                                           filters: [
-                                               {
-                                                   name: "tag:fhcap-base",
-                                                   values: ["true"],
-                                               },
-                                           ],
-                                       })
-            if resp.images.empty?
-              thor.say "Could not determine valid base image, tag an appropriate image with \"fhcap-base:true\", and re-run this command to add this region!"
-              next
+            resp = ec2.describe_regions
+            thor.say "Found #{resp.regions.length} regions for this AWS account: #{resp.regions.collect { |r| r.region_name }}"
+            resp.regions.each do |region|
+              thor.say "Configure #{region.region_name}", :yellow
+              ec2 = Aws::EC2::Client.new(
+                  region: region.region_name,
+                  access_key_id: creds[:'aws-access-key'],
+                  secret_access_key: creds[:'aws-secret-key']
+              )
+
+              resp = ec2.describe_images({
+                                             filters: [
+                                                 {
+                                                     name: "tag:fhcap-base",
+                                                     values: ["true"],
+                                                 },
+                                             ],
+                                         })
+              if resp.images.empty?
+                thor.say "Could not determine valid base image, tag an appropriate image with \"fhcap-base:true\", and re-run this command to add this region!"
+                next
+              end
+              cfg[:regions][region.region_name.to_sym] = {}
+
+              base_image = resp.images.first.image_id
+              thor.say "Adding Base Image: #{base_image}"
+              cfg[:regions][region.region_name.to_sym][:base_image] = base_image
+
+              resp = ec2.describe_availability_zones
+              zones = resp.availability_zones.collect do |az|
+                az.zone_name
+              end
+              thor.say "Adding #{zones.length} Availability Zones: #{zones}"
+              cfg[:regions][region.region_name.to_sym][:availability_zones] = zones
             end
-            cfg[:regions][region.region_name.to_sym] = {}
-
-            base_image = resp.images.first.image_id
-            thor.say "Adding Base Image: #{base_image}"
-            cfg[:regions][region.region_name.to_sym][:base_image] = base_image
-
-            resp = ec2.describe_availability_zones
-            zones = resp.availability_zones.collect do |az|
-              az.zone_name
-            end
-            thor.say "Adding #{zones.length} Availability Zones: #{zones}"
-            cfg[:regions][region.region_name.to_sym][:availability_zones] = zones
-
           end
           cfg[:provides] << 'compute'
           cfg[:provides].uniq!

data/lib/fhcap/version.rb

@@ -1,3 +1,3 @@
 module Fhcap
-  VERSION = "0.4.14"
+  VERSION = "0.4.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -553,6 +553,7 @@ files:
 - lib/fhcap/tasks/cluster/generate.rb
 - lib/fhcap/tasks/cluster/info.rb
 - lib/fhcap/tasks/cluster/list.rb
+- lib/fhcap/tasks/cluster/promote_cookbooks.rb
 - lib/fhcap/tasks/cluster/provision.rb
 - lib/fhcap/tasks/cluster/status.rb
 - lib/fhcap/tasks/cluster/test.rb