fhcap-cli 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7442c785069713ce88491a3c794e162190f0d168
-  data.tar.gz: c84d4ad6ef141c6204822b10bf7ff022b18491c3
+  metadata.gz: ddbd3378ec5fc7f63b7f35b5258b280094410dad
+  data.tar.gz: e2f741990616c6df616b0d3e15943d9c92016ede
 SHA512:
-  metadata.gz: bd8af02970b9092f546fe75419c14e65b0c1ecc665a6071ad89108a968c4f78f0fdb61a2d2426bb30941e90bb4bc112e233d85c360f20a4c335a734c106f0850
-  data.tar.gz: 3aacd843308e099f9c8e302f27eead3776410727e62b636acbe7fd00ae4b2ba19f932e68939346aa7fc0aee49788151b97a70f7e543cb51e2ce4eb79f61f5975
+  metadata.gz: c0c9e75019bf435b9f0bbf2b334a4886515e508d2746cd6623a65c28836bf6fba5a17df56af77ce97033fdbd6eda9d020e43e4c1364d46cc5fbf238ddd5e1037
+  data.tar.gz: 1a4fa88a8a2a39cb787f8cf3e6d5ea521515beda310cd88382b6a4199f5227a6c892411c1ec61d83b0bb270bf801c457c35e45254de7757c6cd76be09481bece

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+## Unreleased
+
+## 0.4.8
+
+* [RHMAP-7637] - Fix Chef::Config constant in global namespace
+* [RHMAP-7532] - Fix OSE cluster generation in AWS accounts that do not have a default VPC
+* Add OSE Console to cluster info task output
+* Fix Route53 DNS creation when using a multiple AWS accounts
+
 ## 0.4.7
 
 * [RHMAP-6559] - Add ose-single template for AWS and OpenStack, creates a single node OpenShift Enterprise 3 instance.

data/lib/cookbooks/provision/recipes/aws_cluster_create.rb

@@ -21,6 +21,8 @@ if cluster_config[:vpc]
     cidr_block cluster_config[:vpc][:cidr]
     internet_gateway true
     main_routes '0.0.0.0/0' => :internet_gateway
+    enable_dns_support cluster_config[:vpc].key?(:enable_dns_support) ? cluster_config[:vpc][:enable_dns_support] : true
+    enable_dns_hostnames cluster_config[:vpc].key?(:enable_dns_hostnames) ? cluster_config[:vpc][:enable_dns_hostnames] : false
   end
 end
 

data/lib/fhcap/knife_helper.rb

@@ -27,15 +27,15 @@ module Fhcap
     end
 
     def chef_server_config_for(name)
-      Chef::Config.from_file(knife_config_file_for(name))
+      ::Chef::Config.from_file(knife_config_file_for(name))
     end
 
     def chef_server_config_hash_for(name)
       chef_server_config_for(name)
       chef_server_config = {
-          chef_server_url: Chef::Config[:chef_server_url],
-          node_name: Chef::Config[:node_name],
-          client_key: Chef::Config[:client_key],
+          chef_server_url: ::Chef::Config[:chef_server_url],
+          node_name: ::Chef::Config[:node_name],
+          client_key: ::Chef::Config[:client_key],
       }
     end
 
@@ -153,4 +153,4 @@ module Fhcap
     end
 
   end
-end
+end

data/lib/fhcap/repos_helper.rb

@@ -150,7 +150,7 @@ module Fhcap
           ::Chef::Knife::Deps.load_deps
           knife_deps = ::Chef::Knife::Deps.new(["."])
           knife_deps.configure_chef
-          Chef::Config[:cookbook_path] = repo_cookbook_paths
+          ::Chef::Config[:cookbook_path] = repo_cookbook_paths
 
           entries = ::Chef::ChefFS::FileSystem.list(knife_deps.local_fs, ::Chef::ChefFS::FilePattern.new("/cookbooks/#{name}/."))
           entries.each do |entry|
@@ -214,4 +214,4 @@ module Fhcap
     end
 
   end
-end
+end

data/lib/fhcap/tasks/chef/server/info.rb

@@ -57,6 +57,14 @@ module Fhcap
               thor.say_status "[#{env}] RabbitMQ Dashboard:", "#{urls[env][:rabbitmq]}", :cyan
             end
 
+            search_cmd = "search 'chef_environment:#{env} AND roles:ose_master_server'"
+            search_options = '-a openshift.domain'
+            node = nodes_for(search_cmd, search_options).first
+            if node
+              urls[env][:ose_master] = "https://#{node['openshift.domain']}:8443"
+              thor.say_status "[#{env}] OpenShift Console:", "#{urls[env][:ose_master]}", :cyan
+            end
+
           end
 
           def nodes_for(search_cmd, search_options)

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

@@ -21,16 +21,11 @@ module Fhcap
           @environment_config = @cluster_config[:environments][@environment_name.to_sym] || {}
 
           template_filepath = File.join(Fhcap.source_root, 'templates', 'cluster', @cluster_config[:driver], "#{template}.json.erb")
-          eruby = Erubis::Eruby.new(File.read(template_filepath))
-          result = eruby.result(
-              {
-                  config: {
-                      domain: @domain,
-                      environment_name: @environment_name
-                  }
-              }
-          )
-          @environment_config.merge!(JSON.parse(result, {:symbolize_names => true}))
+          env_template_config = template_as_object(template_filepath, @cluster_config.merge({
+              domain: @domain,
+              environment_name: @environment_name
+          }))
+          @environment_config.merge!(env_template_config)
 
           @availability_zones = provider_availability_zones(@cluster_config[:provider_id], @cluster_config[:provider_config][:region])
           @cidr = @cluster_config[:provider_config][:cidr]
@@ -76,6 +71,11 @@ module Fhcap
             environment_config.delete(:security_groups)
           end
 
+          if environment_config[:vpc] && cluster_config[:vpc]
+            cluster_config[:vpc].merge!(environment_config[:vpc])
+            environment_config.delete(:vpc)
+          end
+
           cluster_config[:environments][environment_name.to_sym] = cluster_config[:environments][environment_name.to_sym] || {}
           cluster_config[:environments][environment_name.to_sym].merge!(environment_config)
         end

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

@@ -126,8 +126,6 @@ module Fhcap
           template_config = template_as_object(env_template_file, cluster_config)
 
           template_config[:environments].each do |env|
-            env_template_file = File.join(Fhcap.source_root, 'templates', 'cluster', cluster_config[:driver], "#{env[:template]}.json.erb")
-            template_config = template_as_object(env_template_file, cluster_config)
 
             env_domain = [env[:'domain-prefix'], cluster_config[:domain]].compact.join('.')
             env_cfg = {

data/lib/fhcap/tasks/dns/route53_helper.rb

@@ -38,8 +38,7 @@ module Fhcap
       creds = cfg[:credentials]
       client = Aws::Route53::Client.new(
           region: region,
-          access_key_id: creds[:'aws-access-key'],
-          secret_access_key: creds[:'aws-secret-key']
+          credentials: Aws::Credentials.new(creds[:'aws-access-key'], creds[:'aws-secret-key'])
       )
       yield client
     end

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

@@ -127,13 +127,13 @@ KcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==
 
         def validate_knife_config(knife_config_file)
           if File.exists? knife_config_file
-            Chef::Config.from_file(knife_config_file)
-            unless File.exists? Chef::Config[:validation_key]
-              thor.say_status 'missing', Chef::Config[:validation_key], :red
+            ::Chef::Config.from_file(knife_config_file)
+            unless File.exists? ::Chef::Config[:validation_key]
+              thor.say_status 'missing', ::Chef::Config[:validation_key], :red
             end
 
-            unless File.exists? Chef::Config[:client_key]
-              thor.say_status 'missing', Chef::Config[:client_key], :red
+            unless File.exists? ::Chef::Config[:client_key]
+              thor.say_status 'missing', ::Chef::Config[:client_key], :red
             end
           else
             thor.say_status 'missing', knife_config_file, :red
@@ -143,4 +143,4 @@ KcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==
       end
     end
   end
-end
+end

data/lib/fhcap/version.rb

@@ -1,3 +1,3 @@
 module Fhcap
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/templates/cluster/aws/common.json.erb

@@ -6,7 +6,9 @@
   <%- unless config[:provider_config][:cidr] == "none" %>
   "vpc": {
     "region": "<%= config[:provider_config][:region] %>",
-    "cidr": "<%= config[:provider_config][:cidr] %>"
+    "cidr": "<%= config[:provider_config][:cidr] %>",
+    "enable_dns_support": true,
+    "enable_dns_hostnames": false
   },
   <%- end %>
   "default_instance_options": {

data/templates/cluster/aws/ose-single.json.erb

@@ -1,5 +1,17 @@
 {
   "domain": "<%= config[:domain] %>",
+  <%- unless config[:provider_config][:cidr] == "none" -%>
+  "subnets": {
+    "1a": {
+      "cidr": "0/26",
+      "availability_zone": "1a"
+    }
+  },
+  "vpc": {
+    "enable_dns_support": true,
+    "enable_dns_hostnames": true
+  },
+  <%- end -%>
   "security_groups": {
     "oseinternal": {
       "authorize_ingress": [
@@ -68,6 +80,10 @@
           "oseinternal",
           "oseexternal"
         ]
+        <%- unless config[:provider_config][:cidr] == "none" -%>
+        ,"private_ip_address": "",
+        "subnet": "1a"
+        <%- end -%>
       },
       "run_list": [
         "role[ose_master_server]",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor