fhcap-cli 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78bf8ef12f1a57a0cea0fb7d43f449ebaa837d3e
-  data.tar.gz: 20bd845bfbed5c9adf26e8d4b5785737c5ed7a73
+  metadata.gz: 7442c785069713ce88491a3c794e162190f0d168
+  data.tar.gz: c84d4ad6ef141c6204822b10bf7ff022b18491c3
 SHA512:
-  metadata.gz: 114792fc44c7c251413a224373f8ad1d196742eabac60c3dd65fb221194f2afa2be27c0e39d70dce77a9c99c631212aacd3001d2c79947bc37908acbcd5b5ea5
-  data.tar.gz: 57d6da1fe18c0233a7cfeb02643c2c7a045b3fd3308f972fd013aaae72ee356d30f934c4a3b9e7aeedb1984c36019c53c6d6e99ea6a3c162a0ba2a1084af4f67
+  metadata.gz: bd8af02970b9092f546fe75419c14e65b0c1ecc665a6071ad89108a968c4f78f0fdb61a2d2426bb30941e90bb4bc112e233d85c360f20a4c335a734c106f0850
+  data.tar.gz: 3aacd843308e099f9c8e302f27eead3776410727e62b636acbe7fd00ae4b2ba19f932e68939346aa7fc0aee49788151b97a70f7e543cb51e2ce4eb79f61f5975

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+## 0.4.7
+
+* [RHMAP-6559] - Add ose-single template for AWS and OpenStack, creates a single node OpenShift Enterprise 3 instance.
+* Make VPC optional on AWS clusters, will use the default VPC for the region if not specified.
+* Removed self signed SSL cert creation during cluster generate.
+
 ## 0.4.6
 
 * [RHMAP-3031] - Add aws-tags (Name, Organisationm, Environment and Role) to all instances

data/lib/cookbooks/provision/libraries/provision.rb

@@ -54,13 +54,12 @@ def aws_bootstrap_options(org_name, environment, instance_options)
       image_id: instance_options[:image_id],
       instance_type: instance_options[:instance_type],
       key_name: key_pair_name_for(org_name)
-      #key_path: "~/.chef/keys/chef_default"
   }
-  bootstrap_options[:subnet] = subnet_name_for(org_name, environment, instance_options[:subnet])
+  bootstrap_options[:subnet] = subnet_name_for(org_name, environment, instance_options[:subnet]) if instance_options[:subnet]
   bootstrap_options[:security_group_ids] = instance_options[:security_groups].collect do |security_group|
     security_group_name_for(org_name, security_group)
-  end
-  bootstrap_options[:block_device_mappings] = instance_options[:block_device_mappings]
+  end if instance_options[:security_groups]
+  bootstrap_options[:block_device_mappings] = instance_options[:block_device_mappings] if instance_options[:block_device_mappings]
   bootstrap_options
 end
 

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

@@ -4,7 +4,10 @@ require 'chef/provisioning/aws_driver'
 require 'extensions/chef/provisioning/aws_driver/driver.rb'
 
 cluster_config = cluster_config_for(node)
-region = cluster_config[:vpc][:region]
+
+raise "Missing aws region" unless cluster_config[:provider_config][:region]
+
+region = cluster_config[:provider_config][:region]
 with_driver("aws:default:#{region}", {
     :aws_credentials => {
         "default" => {

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

@@ -12,53 +12,60 @@ aws_key_pair key_pair_name do
   public_key_path File.join(local_key_pairs_dir, "#{key_pair_name}.pub")
 end
 
+vpc_name = nil
+if cluster_config[:vpc]
 #Create VPC
-vpc_name = vpc_name_for(org_name)
+  vpc_name = vpc_name_for(org_name)
 
-aws_vpc vpc_name do
-  cidr_block cluster_config[:vpc][:cidr]
-  internet_gateway true
-  main_routes '0.0.0.0/0' => :internet_gateway
+  aws_vpc vpc_name do
+    cidr_block cluster_config[:vpc][:cidr]
+    internet_gateway true
+    main_routes '0.0.0.0/0' => :internet_gateway
+  end
 end
 
+if cluster_config[:security_groups]
 # Create Security Groups with empty rules first to avoid group dependent rule conflicts
-cluster_config[:security_groups].each do |sg_name, sg_config|
-  aws_security_group security_group_name_for(org_name, sg_name) do
-    vpc vpc_name
+  cluster_config[:security_groups].each do |sg_name, sg_config|
+    aws_security_group security_group_name_for(org_name, sg_name) do
+      vpc vpc_name
+    end
   end
-end
 
-# Create Security Groups
-cluster_config[:security_groups].each do |sg_name, sg_config|
-  aws_security_group security_group_name_for(org_name, sg_name) do
-    vpc vpc_name
-    inbound_rules inbound_rules_for(org_name, sg_config[:authorize_ingress])
+  cluster_config[:security_groups].each do |sg_name, sg_config|
+    aws_security_group security_group_name_for(org_name, sg_name) do
+      vpc vpc_name
+      inbound_rules inbound_rules_for(org_name, sg_config[:authorize_ingress])
+    end
   end
 end
 
+if vpc_name
 # Create Route Tables
-cluster_config[:environments].each do |env, env_config|
+  cluster_config[:environments].each do |env, env_config|
 
-  env_route_table = route_table_name_for(org_name, env)
-  aws_route_table env_route_table do
-    vpc vpc_name
-    routes '0.0.0.0/0' => :internet_gateway
-  end
+    env_route_table = route_table_name_for(org_name, env)
+    aws_route_table env_route_table do
+      vpc vpc_name
+      routes '0.0.0.0/0' => :internet_gateway
+    end
 
-  env_config[:subnets].each do |subnet_suffix, subnet_config|
+    env_config[:subnets].each do |subnet_suffix, subnet_config|
+
+      subnet_name = subnet_name_for(org_name, env, subnet_suffix)
+      aws_subnet subnet_name do
+        vpc vpc_name
+        cidr_block subnet_config[:cidr]
+        availability_zone subnet_config[:availability_zone]
+        route_table env_route_table
+        map_public_ip_on_launch true
+      end
 
-    subnet_name = subnet_name_for(org_name, env, subnet_suffix)
-    aws_subnet subnet_name do
-      vpc vpc_name
-      cidr_block subnet_config[:cidr]
-      availability_zone subnet_config[:availability_zone]
-      route_table env_route_table
-      map_public_ip_on_launch true
     end
 
   end
-
 end
 
 include_recipe "provision::cluster_create_instances"
-include_recipe "provision::aws_cluster_create_elb"
+include_recipe "provision::aws_cluster_create_elb"
+include_recipe "provision::aws_cluster_create_eip"

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

@@ -0,0 +1,19 @@
+include_recipe 'provision::common'
+include_recipe "provision::aws"
+
+with_cluster_instances(node) do |cluster_instances|
+  cluster_instances.each do |chef_environment, instances|
+    with_chef_environment chef_environment do
+
+      instances.each do |name, cfg|
+
+        aws_eip_address "#{name}-eip" do
+          machine name
+          associate_to_vpc true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ cluster_config = cluster_config_for(node)
 
 org_name = cluster_config[:id]
 
+include_recipe "provision::aws_cluster_destroy_eip"
 include_recipe "provision::cluster_destroy_instances"
 
 cluster_config[:environments].each do |env, env_config|
@@ -16,24 +17,28 @@ cluster_config[:environments].each do |env, env_config|
   end if env_config[:load_balancers]
 end
 
-# Clear all rules from Security Groups so that all dependent objects are cleared. This can potentially re-create security groups, so we have to force the destroy again below.
-cluster_config[:security_groups].each do |sg_name, sg_config|
-  aws_security_group security_group_name_for(org_name, sg_name) do
-    inbound_rules []
-  end
-end
+if cluster_config[:security_groups]
+  # Clear all rules from Security Groups so that all dependent objects are cleared. This can potentially re-create security groups, so we have to force the destroy again below.
+  cluster_config[:security_groups].each do |sg_name, sg_config|
+    aws_security_group security_group_name_for(org_name, sg_name) do
+      inbound_rules []
+    end
+  end if cluster_config[:security_groups]
 
-# Destroy all security groups. vpc purge would do this, but since we could have potentially re-created the group above, we do it here to be sure its removed.
-cluster_config[:security_groups].each do |sg_name, sg_config|
-  aws_security_group security_group_name_for(org_name, sg_name) do
-    action :destroy
-    ignore_failure true
+  # Destroy all security groups. vpc purge would do this, but since we could have potentially re-created the group above, we do it here to be sure its removed.
+  cluster_config[:security_groups].each do |sg_name, sg_config|
+    aws_security_group security_group_name_for(org_name, sg_name) do
+      action :destroy
+      ignore_failure true
+    end
   end
 end
 
-vpc_name = vpc_name_for(org_name)
-aws_vpc vpc_name do
-  action :purge
+if cluster_config[:vpc]
+  vpc_name = vpc_name_for(org_name)
+  aws_vpc vpc_name do
+    action :purge
+  end
 end
 
 cluster_config[:environments].each do |env, env_config|
@@ -45,7 +50,7 @@ cluster_config[:environments].each do |env, env_config|
     aws_subnet  subnet_name_for(org_name, env, subnet_suffix) do
       action :destroy
     end
-  end
+  end if env_config[:subnets]
 end
 
 aws_key_pair key_pair_name_for(org_name) do

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

@@ -0,0 +1,15 @@
+include_recipe 'provision::common'
+include_recipe "provision::aws"
+
+with_cluster_instances(node) do |cluster_instances|
+  cluster_instances.each do |chef_environment, instances|
+    with_chef_environment chef_environment do
+
+      instances.each do |name, cfg|
+        aws_eip_address "#{name}-eip" do
+          action :destroy
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+include_recipe 'provision::common'
+include_recipe "provision::#{node['driver']}"
+
+cluster_config = cluster_config_for(node)
+org_name = cluster_config[:id]
+
+cluster_config[:environments].each do |env, env_config|
+  chef_environment = fh_name_for(org_name, env)
+
+  installer_node = search(:node, "recipes:openshift\\:\\:installer AND chef_environment:#{chef_environment}").first
+
+  with_chef_environment chef_environment do
+
+    machine_execute "#{installer_node.name} run ose installer" do
+      command "su hadmin -c 'yes '' | atomic-openshift-installer --unattended --configuration /home/hadmin/.config/openshift/installer.cfg.yml install --force'"
+      live_stream true
+      machine installer_node.name
+      only_if { installer_node }
+    end
+
+  end
+
+end
+
+include_recipe 'provision::ose_post_install'

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

@@ -0,0 +1,30 @@
+include_recipe 'provision::common'
+include_recipe "provision::#{node['driver']}"
+
+cluster_config = cluster_config_for(node)
+org_name = cluster_config[:id]
+
+cluster_config[:environments].each do |env, env_config|
+  chef_environment = fh_name_for(org_name, env)
+
+  installer_node = search(:node, "recipes:openshift\\:\\:installer AND chef_environment:#{chef_environment}").first
+
+  if installer_node
+    with_chef_environment chef_environment do
+      machine_execute "#{installer_node.name} create registry" do
+        command "oadm registry --service-account=registry --credentials=/etc/origin/master/openshift-registry.kubeconfig --images='registry.access.redhat.com/openshift3/ose-${component}:${version}'"
+        live_stream true
+        machine installer_node.name
+        only_if { installer_node }
+      end
+
+      machine_execute "#{installer_node.name} create router" do
+        command "oadm router default-router --service-account=router --credentials='/etc/origin/master/openshift-router.kubeconfig' --images='registry.access.redhat.com/openshift3/ose-${component}:${version}'"
+        live_stream true
+        machine installer_node.name
+        only_if { installer_node }
+      end
+    end
+  end
+
+end

data/lib/fhcap/knife_helper.rb

@@ -1,3 +1,8 @@
+require 'chef'
+require 'chef/knife'
+require 'fhcap/tasks/chef/chef_zero_server'
+require 'chef/knife/upload'
+require 'chef/knife/download'
 require 'chef/config'
 
 module Fhcap
@@ -34,5 +39,118 @@ module Fhcap
       }
     end
 
+    def with_chef_server(cfg, &block)
+      ::Chef::Config.solo = false
+      if local_chef_server? cfg
+        with_local_chef_server(repo_dir(cfg[:repo]), &block)
+      else
+        block.call
+      end
+    end
+
+    def with_local_chef_server(local_repo, &block)
+      begin
+        ::Chef::Config.from_file(knife_config_file_for('local'))
+        uri = URI(::Chef::Config[:chef_server_url])
+        host = uri.hostname
+        port = uri.port
+      rescue
+        host = '127.0.0.1'
+        port = 7799
+      end
+
+      zero_server = Fhcap::Tasks::Chef::ChefZeroServer.new({host: host, port: port})
+
+      begin
+        zero_server.start_chef_zero_server
+        if zero_server.running?
+          thor.say "[Chef Zero Server] - running at #{zero_server.url}"
+        else
+          thor.say "[Chef Zero Server] - Failed to start server", :red
+          exit(-1)
+        end
+      rescue Errno::EADDRINUSE => e
+        thor.say "[Chef Zero Server] - Address in use (#{host}:#{port}), assuming this is ok"
+      end
+
+      thor.say "[Chef Zero Server] - Syncing nodes from #{local_repo}"
+      knife_upload(local_repo, 'local', ['/nodes'])
+      knife_upload(local_repo, 'local', ['/data_bags/aws_*'])
+      begin
+        block.call
+      ensure
+        thor.say "[Chef Zero Server] - Syncing nodes to #{local_repo}"
+        FileUtils.rm_rf(File.join(local_repo, 'nodes'))
+        FileUtils.rm_rf Dir.glob(File.join(local_repo, 'data_bags/aws_*'))
+        knife_download(local_repo, 'local', ['/nodes'])
+        knife_download(local_repo, 'local', ['/data_bags/aws_*'])
+      end
+    end
+
+    def local_chef_server?(cfg={})
+      cfg[:chef_server] && cfg[:chef_server] == 'local'
+    end
+
+    def knife_upload(repo, server, pattern)
+      thor.say " * uploading local repo items from #{repo} - #{pattern} ..."
+      suppress_stdout(!options[:verbose]) do
+        Dir.chdir(repo) do
+          ::Chef::Knife::Upload.load_deps
+          knife_command = ::Chef::Knife::Upload.new(pattern)
+          knife_command.config[:config_file] = knife_config_file_for(server)
+          knife_command.config[:chef_repo_path] = repo
+          knife_command.configure_chef
+          knife_command.config[:recurse] = true
+          knife_command.run
+        end
+      end
+    end
+
+    def knife_download(repo, server, pattern)
+      thor.say " * downloading server items to #{repo} - #{pattern} ..."
+      suppress_stdout(!options[:verbose]) do
+        Dir.chdir(repo) do
+          ::Chef::Knife::Download.load_deps
+          knife_command = ::Chef::Knife::Download.new(pattern)
+          knife_command.config[:config_file] = knife_config_file_for(server)
+          knife_command.config[:chef_repo_path] = repo
+          knife_command.configure_chef
+          knife_command.config[:recurse] = true
+          knife_command.run
+        end
+      end
+    end
+
+    def knife_environment_delete(env, server)
+      thor.say " * deleting environment '#{env}' from #{server}"
+      delete_chef_object(::Chef::Knife::EnvironmentDelete, server, env)
+    end
+
+    def knife_data_bag_delete(data_bag, item, server)
+      thor.say " * deleting data bag '#{data_bag} #{item}' from #{server}"
+      delete_chef_object(::Chef::Knife::DataBagDelete, server, data_bag, item)
+    end
+
+    def delete_chef_object(klass, server, *args)
+      begin
+        suppress_stdout(!options[:verbose]) do
+          klass.load_deps
+          knife_command = klass.new(args)
+          knife_command.config[:config_file] = knife_config_file_for(server)
+          knife_command.config[:yes] = true
+          knife_command.configure_chef
+          knife_command.run
+        end
+      rescue Net::HTTPServerException => e
+        response = e.response
+        case response
+          when Net::HTTPNotFound
+            puts "The object you are looking for could not be found, assuming this ok and continuing ..."
+          else
+            raise e
+        end
+      end
+    end
+
   end
 end

data/lib/fhcap/tasks/chef/chef_server_task.rb

@@ -1,16 +1,13 @@
 require 'fhcap/tasks/chef/chef_task_base'
-require 'chef'
-require 'chef/knife'
-require 'fhcap/tasks/chef/chef_zero_server'
-require 'chef/knife/upload'
-require 'chef/knife/download'
-require 'chef/config'
+require 'fhcap/knife_helper'
 
 module Fhcap
   module Tasks
     module Chef
       class ChefServerTask < ChefTaskBase
 
+        include Fhcap::KnifeHelper
+
         attr_reader :chef_server, :chef_repo, :repos
 
         def initialize(options)
@@ -23,117 +20,16 @@ module Fhcap
         def with_chef_server(&block)
           ::Chef::Config.solo = false
           if local_chef_server?
-            with_local_chef_server(&block)
+            with_local_chef_server(repo_dir(@chef_repo), &block)
           else
             block.call
           end
         end
 
-        def with_local_chef_server(&block)
-          begin
-            ::Chef::Config.from_file(knife_config_file_for('local'))
-            uri = URI(::Chef::Config[:chef_server_url])
-            host = uri.hostname
-            port = uri.port
-          rescue
-            host = '127.0.0.1'
-            port = 7799
-          end
-
-          zero_server = Fhcap::Tasks::Chef::ChefZeroServer.new({host: host, port: port})
-
-          begin
-            zero_server.start_chef_zero_server
-            if zero_server.running?
-              thor.say "[Chef Zero Server] - running at #{zero_server.url}"
-            else
-              thor.say "[Chef Zero Server] - Failed to start server", :red
-              exit(-1)
-            end
-          rescue Errno::EADDRINUSE => e
-            thor.say "[Chef Zero Server] - Address in use (#{host}:#{port}), assuming this is ok"
-          end
-
-          local_repo = repo_dir(@chef_repo)
-          thor.say "[Chef Zero Server] - Syncing nodes from #{local_repo}"
-          knife_upload(local_repo, @chef_server, ['/nodes'])
-          knife_upload(local_repo, @chef_server, ['/data_bags/aws_*'])
-          begin
-            block.call
-          ensure
-            thor.say "[Chef Zero Server] - Syncing nodes to #{local_repo}"
-            FileUtils.rm_rf(File.join(local_repo, 'nodes'))
-            FileUtils.rm_rf Dir.glob(File.join(local_repo, 'data_bags/aws_*'))
-            knife_download(local_repo, @chef_server, ['/nodes'])
-            knife_download(local_repo, @chef_server, ['/data_bags/aws_*'])
-          end
-        end
-
         def local_chef_server?
           chef_server && chef_server == 'local'
         end
 
-        def knife_upload(repo, server, pattern)
-          thor.say " * uploading local repo items from #{repo} - #{pattern} ..."
-          suppress_stdout(!options[:verbose]) do
-            Dir.chdir(repo) do
-              ::Chef::Knife::Upload.load_deps
-              knife_command = ::Chef::Knife::Upload.new(pattern)
-              knife_command.config[:config_file] = knife_config_file_for(server)
-              knife_command.config[:chef_repo_path] = repo
-              knife_command.configure_chef
-              knife_command.config[:recurse] = true
-              knife_command.run
-            end
-          end
-        end
-
-        def knife_download(repo, server, pattern)
-          thor.say " * downloading server items to #{repo} - #{pattern} ..."
-          suppress_stdout(!options[:verbose]) do
-            Dir.chdir(repo) do
-              ::Chef::Knife::Download.load_deps
-              knife_command = ::Chef::Knife::Download.new(pattern)
-              knife_command.config[:config_file] = knife_config_file_for(server)
-              knife_command.config[:chef_repo_path] = repo
-              knife_command.configure_chef
-              knife_command.config[:recurse] = true
-              knife_command.run
-            end
-          end
-        end
-
-        def knife_environment_delete(env, server)
-          thor.say " * deleting environment '#{env}' from #{server}"
-          delete_chef_object(::Chef::Knife::EnvironmentDelete, server, env)
-        end
-
-        def knife_data_bag_delete(data_bag, item, server)
-          thor.say " * deleting data bag '#{data_bag} #{item}' from #{server}"
-          delete_chef_object(::Chef::Knife::DataBagDelete, server, data_bag, item)
-        end
-
-        def delete_chef_object(klass, server, *args)
-          begin
-            suppress_stdout(!options[:verbose]) do
-              klass.load_deps
-              knife_command = klass.new(args)
-              knife_command.config[:config_file] = knife_config_file_for(server)
-              knife_command.config[:yes] = true
-              knife_command.configure_chef
-              knife_command.run
-            end
-          rescue Net::HTTPServerException => e
-            response = e.response
-            case response
-              when Net::HTTPNotFound
-                puts "The object you are looking for could not be found, assuming this ok and continuing ..."
-              else
-                raise e
-            end
-          end
-        end
-
       end
     end
   end

data/lib/fhcap/tasks/chef/environments/create.rb

@@ -83,6 +83,7 @@ module Fhcap
               config[user.to_sym][:ssh_public_key] = key.ssh_public_key
               config[user.to_sym][:ssh_private_key] = key.private_key
             end
+            config[:users][:hadmin][:ssh_keys] << config[:users][:hadmin][:ssh_public_key]
             config[:users][:hadmin][:ssh_keys] << config[:nagios_user][:ssh_public_key]
 
             #root_user

data/lib/fhcap/tasks/chef/provisioning/create.rb

@@ -15,7 +15,8 @@ module Fhcap
 
               unless options[:'skip-provision']
                 do_chef_run("provision::cluster_bootstrap")
-                seed_cookbooks if local_chef_server?
+                #ToDo Do we need this anymore?
+                #seed_cookbooks if local_chef_server?
                 do_chef_run("provision::post_create_instances")
 
                 #Need to set run list correctly here after post create stuff since provision no longer does it

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

@@ -1,4 +1,5 @@
 require 'fhcap/tasks/cluster/cluster_task_base'
+require 'fhcap/knife_helper'
 require "fhcap/tasks/dns/create_record"
 
 module Fhcap
@@ -6,13 +7,18 @@ module Fhcap
     module Cluster
       class CreateDNSRecords < ClusterTaskBase
 
+        include Fhcap::KnifeHelper
+
         def initialize(options)
           super(options)
         end
 
         def run
           thor.say "Cluster::CreateDNSRecords", :yellow
-          create_dns_record
+          with_chef_server(cluster_config) do
+            create_dns_record
+            create_records_openshift
+          end
         end
 
         private
@@ -65,29 +71,41 @@ module Fhcap
         end
 
         def create_dns_record_openstack
+          create_records_for_query("recipes:nginx_feedhenry\\:\\:loadbalancer", ["*"])
+        end
+
+        def create_records_openshift
+          #This is a very basic openshift DNS setup and does not take into account a HA setup or LBs
+          create_records_for_query("roles:ose_master_server", [""])
+          create_records_for_query("roles:ose_node_server", ["*"])
+        end
+
+        def create_records_for_query(query, records)
           cluster_config[:environments].each do |env_name, env_cfg|
             env_name = "#{name}-#{env_name}"
             knife_config_file = knife_config_file_for(cluster_config[:chef_server])
             #ToDo [RHMAP-2898] Use knife object
-            nodes = JSON.parse(`knife search "chef_environment:#{env_name} AND recipes:nginx_feedhenry\\:\\:loadbalancer" -c #{knife_config_file} -F json -a name -a cloud.public_ipv4`)
+            nodes = JSON.parse(`knife search "chef_environment:#{env_name} AND #{query}" -c #{knife_config_file} -F json -a name -a cloud.public_ipv4`)
 
-            lb_node = nodes['rows'].collect do |row|
+            query_node = nodes['rows'].collect do |row|
               name, attrs = row.first
               attrs
             end.first
 
-            if lb_node
-              if lb_node['cloud.public_ipv4']
-                dns_record_cfg = {
-                    domain: "*.#{env_cfg[:domain]}",
-                    ipaddress: lb_node['cloud.public_ipv4']
-                }
-                Dns::CreateRecord.new(@options.dup.merge(dns_record_cfg)).run
+            if query_node
+              if query_node['cloud.public_ipv4']
+                records.each do |record|
+                  dns_record_cfg = {
+                      domain: [record, env_cfg[:domain]].compact.reject(&:empty?).join('.'),
+                      ipaddress: query_node['cloud.public_ipv4']
+                  }
+                  Dns::CreateRecord.new(@options.dup.merge(dns_record_cfg)).run
+                end
               else
-                thor.say "Found lb node '#{lb_node['name']}', but was unable to retrieve it's IP!!}"
+                thor.say "Found query node '#{query_node['name']}', but was unable to retrieve it's IP!!}"
               end
             else
-              thor.say "Unable to locate lb node in cluster!!"
+              thor.say "Unable to locate node for query '#{query}' in cluster!!"
             end
           end
         end

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

@@ -49,7 +49,6 @@ module Fhcap
           }
           generate_environment_config
           create_chef_environment(env_cfg)
-          create_ssl_cert(env_cfg)
           thor.create_file(cluster_file, JSON.pretty_generate(cluster_config)) unless @skip_create_cluster_file
         end
 
@@ -159,6 +158,8 @@ module Fhcap
               'core'
             when /mbaas/
               'mbaas'
+            when /ose-single/
+              'ose-single'
             when /single/
               'single'
             when /farm/

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

@@ -87,6 +87,7 @@ module Fhcap
           ask_config(required_config, cluster_config)
           cluster_config[:driver] = provider_type(cluster_config[:provider_id])
           send(:"generate_cluster_config_#{cluster_config[:driver]}")
+          generate_machine_options
           driver_template_file = File.join(Fhcap.source_root, 'templates', 'cluster', cluster_config[:driver], "common.json.erb")
           driver_template_config = template_as_object(driver_template_file, cluster_config)
           cluster_config.merge!(driver_template_config)
@@ -94,17 +95,30 @@ module Fhcap
 
         def generate_cluster_config_aws
           ask_config(aws_required_config, cluster_config[:provider_config])
-          aws_regions = provider_config(cluster_config[:provider_id])[:regions]
           cluster_config[:default_instance_options] = cluster_config[:default_instance_options] || {}
-          cluster_config[:default_instance_options][:image_id] = aws_regions[cluster_config[:provider_config][:region].to_sym][:base_image]
+          default_provider_conf = provider_config(@cluster_config[:provider_id])
+          aws_regions = default_provider_conf[:regions]
+          cluster_config[:default_instance_options][:image_id] = cluster_config[:provider_config][:image_id] || aws_regions[cluster_config[:provider_config][:region].to_sym][:base_image]
+          cluster_config[:default_instance_options][:instance_type] = cluster_config[:provider_config][:instance_type] || default_provider_conf[:instance_type]
         end
 
         def generate_cluster_config_openstack
           cluster_config[:default_instance_options] = cluster_config[:default_instance_options] || {}
-          cluster_config[:default_instance_options][:image_ref] = provider_config(@cluster_config[:provider_id])[:image_ref]
-          cluster_config[:default_instance_options][:flavor_ref] = provider_config(@cluster_config[:provider_id])[:flavor_ref]
-          cluster_config[:default_instance_options][:floating_ip_pool] = provider_config(@cluster_config[:provider_id])[:floating_ip_pool]
-          cluster_config[:default_instance_options][:ssh_username] = provider_config(@cluster_config[:provider_id])[:ssh_username]
+          default_provider_conf = provider_config(@cluster_config[:provider_id])
+          cluster_config[:default_instance_options][:image_ref] = cluster_config[:provider_config][:image_ref] || default_provider_conf[:image_ref]
+          cluster_config[:default_instance_options][:flavor_ref] = cluster_config[:provider_config][:flavor_ref] || default_provider_conf[:flavor_ref]
+          cluster_config[:default_instance_options][:floating_ip_pool] = cluster_config[:provider_config][:floating_ip_pool] || default_provider_conf[:floating_ip_pool]
+          cluster_config[:default_instance_options][:ssh_username] = cluster_config[:provider_config][:ssh_username] || default_provider_conf[:ssh_username]
+        end
+
+        def generate_machine_options
+          cluster_config[:machine_options] = cluster_config[:machine_options] || {}
+          cluster_config[:machine_options][:ssh_username] = cluster_config[:provider_config][:ssh_username] || 'ubuntu'
+          cluster_config[:machine_options][:convergence_options] = cluster_config[:machine_options][:convergence_options] || {}
+          cluster_config[:machine_options][:convergence_options][:chef_version] = "12.6.0"
+          cluster_config[:machine_options][:convergence_options][:ssl_verify_mode] = "verify_none"
+          cluster_config[:machine_options][:convergence_options][:ohai_hints] = cluster_config[:machine_options][:convergence_options][:ohai_hints] || {}
+          cluster_config[:machine_options][:convergence_options][:ohai_hints][cluster_config[:driver].to_sym] = {}
         end
 
         def generate_cluster_environments

data/lib/fhcap/version.rb

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

data/lib/fhcap.rb

@@ -3,7 +3,7 @@ require "pathname"
 
 module Fhcap
   GEM_DIR = File.expand_path '..', File.dirname(__FILE__)
-  TEMPLATE_NAMES = %w{single core-3node mbaas-3node core-mbaas-6node core-small-9node nginx-test single-blank farm-3node farm-single}.sort
+  TEMPLATE_NAMES = %w{single core-3node mbaas-3node core-mbaas-6node core-small-9node nginx-test single-blank farm-3node farm-single ose-single}.sort
 
   class << self
     def source_root

data/templates/chef/environment_ose-single.json.erb

@@ -0,0 +1,30 @@
+{
+  "name": "<%= config[:name] %>",
+  "description": "<%= config[:name] %> Environment",
+  "cookbook_versions": {
+  },
+  "json_class": "Chef::Environment",
+  "chef_type": "environment",
+  "default_attributes": {
+    "openshift": {
+      "domain": "<%= config[:domain] %>"
+    },
+    "rhsm": {
+      "username": "CHANGEME",
+      "password": "CHANGEME"
+    },
+    "resolver": {
+      "nameservers": [
+        "8.8.8.8",
+        "8.8.4.4"
+      ]
+    }
+  },
+  "override_attributes": {
+    "authorization": {
+      "sudo": {
+        "passwordless": true
+      }
+    }
+  }
+}

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

@@ -1,8 +1,14 @@
+<%-
+  require 'open-uri'
+  @my_public_ip = open('http://whatismyip.akamai.com').read
+-%>
 {
+  <%- unless config[:provider_config][:cidr] == "none" %>
   "vpc": {
     "region": "<%= config[:provider_config][:region] %>",
     "cidr": "<%= config[:provider_config][:cidr] %>"
   },
+  <%- end %>
   "default_instance_options": {
     "image_id": "<%= config[:default_instance_options][:image_id] %>",
     "monitoring_enabled": true,
@@ -35,7 +41,7 @@
           "protocols": ["all"],
           "start": 0,
           "end": 65535,
-          "sources": ["83.147.149.210/32", "46.38.161.225/32", "54.229.76.48/32", "79.125.117.182/32", "78.137.150.209/32", "52.37.106.23", "52.50.12.70", "52.62.158.176", "52.70.198.93", "52.193.17.19", "52.86.106.110", "52.48.49.57"]
+          "sources": ["<%= @my_public_ip %>", "83.147.149.210/32", "46.38.161.225/32", "54.229.76.48/32", "79.125.117.182/32", "78.137.150.209/32", "52.37.106.23", "52.50.12.70", "52.62.158.176", "52.70.198.93", "52.193.17.19", "52.86.106.110", "52.48.49.57"]
         }
       ]
     },

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

@@ -0,0 +1,78 @@
+{
+  "domain": "<%= config[:domain] %>",
+  "security_groups": {
+    "oseinternal": {
+      "authorize_ingress": [
+        {
+          "protocols": [
+            "all"
+          ],
+          "start": 0,
+          "end": 65535,
+          "groups": [
+            "oseinternal"
+          ]
+        },
+        {
+          "protocols": [
+            "icmp"
+          ],
+          "start": -1,
+          "end": -1,
+          "groups": [
+            "oseinternal"
+          ]
+        }
+      ]
+    },
+    "oseexternal": {
+      "authorize_ingress": [
+        {
+          "protocols": [
+            "tcp"
+          ],
+          "start": 80,
+          "end": 80,
+          "sources": [
+            "0.0.0.0/0"
+          ]
+        },
+        {
+          "protocols": [
+            "tcp"
+          ],
+          "start": 443,
+          "end": 443,
+          "sources": [
+            "0.0.0.0/0"
+          ]
+        },
+        {
+          "protocols": [
+            "tcp"
+          ],
+          "start": 8443,
+          "end": 8443,
+          "sources": [
+            "0.0.0.0/0"
+          ]
+        }
+      ]
+    }
+  },
+  "instances": {
+    "node1": {
+      "aws": {
+        "security_groups": [
+          "ops-admin",
+          "oseinternal",
+          "oseexternal"
+        ]
+      },
+      "run_list": [
+        "role[ose_master_server]",
+        "role[ose_node_server]"
+      ]
+    }
+  }
+}

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

@@ -22,12 +22,6 @@
           "start": 80,
           "end": 80,
           "sources": ["0.0.0.0/0"]
-        },
-        {
-          "protocols": ["tcp"],
-          "start": 443,
-          "end": 443,
-          "sources": ["0.0.0.0/0"]
         }
       ]
     },
@@ -75,13 +69,6 @@
           "protocol": "http",
           "instance_port": 80,
           "instance_protocol": "http"
-        },
-        {
-          "port": 443,
-          "protocol": "https",
-          "instance_port": 80,
-          "instance_protocol": "http",
-          "server_certificate": ""
         }
       ]
     }

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

@@ -0,0 +1,11 @@
+{
+  "domain": "<%= config[:domain] %>",
+  "instances": {
+    "node1": {
+      "run_list": [
+        "role[ose_master_server]",
+        "role[ose_node_server]"
+      ]
+    }
+  }
+}

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

@@ -0,0 +1,8 @@
+{
+  "environments": [
+    {
+      "name": "ose-single",
+      "template": "ose-single"
+    }
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -396,8 +396,10 @@ files:
 - lib/cookbooks/provision/metadata.rb
 - lib/cookbooks/provision/recipes/aws.rb
 - lib/cookbooks/provision/recipes/aws_cluster_create.rb
+- lib/cookbooks/provision/recipes/aws_cluster_create_eip.rb
 - lib/cookbooks/provision/recipes/aws_cluster_create_elb.rb
 - lib/cookbooks/provision/recipes/aws_cluster_destroy.rb
+- lib/cookbooks/provision/recipes/aws_cluster_destroy_eip.rb
 - lib/cookbooks/provision/recipes/cluster_bootstrap.rb
 - lib/cookbooks/provision/recipes/cluster_bootstrap_instances.rb
 - lib/cookbooks/provision/recipes/cluster_create.rb
@@ -414,6 +416,8 @@ files:
 - lib/cookbooks/provision/recipes/openstack.rb
 - lib/cookbooks/provision/recipes/openstack_cluster_create.rb
 - lib/cookbooks/provision/recipes/openstack_cluster_destroy.rb
+- lib/cookbooks/provision/recipes/ose_install.rb
+- lib/cookbooks/provision/recipes/ose_post_install.rb
 - lib/cookbooks/provision/recipes/post_create_instances.rb
 - lib/cookbooks/provision/recipes/rabbitmq_reset_cluster.rb
 - lib/cookbooks/provision/recipes/restart_services.rb
@@ -530,6 +534,7 @@ files:
 - templates/chef/environment_empty.json.erb
 - templates/chef/environment_farm.json.erb
 - templates/chef/environment_mbaas.json.erb
+- templates/chef/environment_ose-single.json.erb
 - templates/chef/environment_single.json.erb
 - templates/cluster/aws/common.json.erb
 - templates/cluster/aws/core-3node.json.erb
@@ -538,6 +543,7 @@ files:
 - templates/cluster/aws/farm-single.json.erb
 - templates/cluster/aws/mbaas-3node.json.erb
 - templates/cluster/aws/nginx-test.json.erb
+- templates/cluster/aws/ose-single.json.erb
 - templates/cluster/aws/single-blank.json.erb
 - templates/cluster/aws/single.json.erb
 - templates/cluster/core-3node.json.erb
@@ -554,8 +560,10 @@ files:
 - templates/cluster/openstack/farm-single.json.erb
 - templates/cluster/openstack/mbaas-3node.json.erb
 - templates/cluster/openstack/nginx-test.json.erb
+- templates/cluster/openstack/ose-single.json.erb
 - templates/cluster/openstack/single-blank.json.erb
 - templates/cluster/openstack/single.json.erb
+- templates/cluster/ose-single.json.erb
 - templates/cluster/single-blank.json.erb
 - templates/cluster/single.json.erb
 - templates/init/knife.rb.erb
@@ -586,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: FHCAP Command Line Tool