RubyGems - stack-kicker - Versions diffs - 0.0.22 → 0.0.23 - Mend

stack-kicker 0.0.22 → 0.0.23

Files changed (9) hide show

data/README.md +5 -1
data/doc/examples/apache-via-cloud-init-centos/README.md +6 -0
data/doc/examples/apache-via-cloud-init-centos/Stackfile +40 -0
data/doc/examples/apache-via-cloud-init-centos/cloud-init.sh +8 -0
data/doc/examples/apache-via-cloud-init-centos/cloud-init.yaml +24 -0
data/doc/examples/apache-via-cloud-init-centos/secgroup_ips.json +1 -0
data/lib/stack-kicker/version.rb +1 -1
data/lib/stack.rb +21 -19
metadata +7 -2

data/README.md CHANGED Viewed

@@ -94,7 +94,11 @@ This can be an array of strings, such that node X will be assigned :floating_ips
 These are used to construct a command to execute, which is executed locally where you executed stack-kicker.  :post_install_args can contain %PUBLIC_IP%, which will be replaced by the public IP of the just created node.  :post_install_script scripts are executed as soon the the instance returns a status='ACTIVE'.  They can be used delay the creation of further nodes of the same role (for example, when creating a rabbitmq cluster, you need to wait for the rabbitmq process to be running before creating the next member of the cluster, or when you are creating a chef-server, you need to wait for the packages to install & daemons to start before attempting to create Chef users & retrieve keys)
 ## [ERB Templates](id:erbtemplates)
-Both the :cloud_config_yaml & :bootstrap role attributes can point to plain files, files with simple tokens (%HOSTNAME%, %CHEF_SERVER%, %CHEF_ENVIRONMENT%, %CHEF_VALIDATION_PEM%, %SERVER_NAME%, %ROLE% and %DATA_DIR%) or [Ruby ERB](http://www.ruby-doc.org/stdlib-2.0/libdoc/erb/rdoc/ERB.html) templates.
+Both the :cloud_config_yaml & :bootstrap role attributes can point to plain files, files with simple tokens (%HOSTNAME%, %CHEF_SERVER%, %CHEF_SERVER_HOSTNAME%, %CHEF_ENVIRONMENT%, %CHEF_VALIDATION_PEM%, %SERVER_NAME%, %ROLE% and %DATA_DIR%) or [Ruby ERB](http://www.ruby-doc.org/stdlib-2.0/libdoc/erb/rdoc/ERB.html) templates.
+%HOSTNAME% is the short name of the instance being built
+%CHEF_SERVER% is the IP address of the Chef Server, private address if the chef server & current instance are in the same AZ, public IP if they are in different AZs
+%CHEF_SERVER_HOSTNAME% name of the chef server, Fully Qualified if config[:domain] is set
 There are 3 key data sets exposed to the ERB templates:

data/doc/examples/apache-via-cloud-init-centos/README.md ADDED Viewed

@@ -0,0 +1,6 @@
+```
+stack-kicker show-stacks
+stack-kicker show-stack
+stack-kicker show-running
+stack-kicker build
+```

data/doc/examples/apache-via-cloud-init-centos/Stackfile ADDED Viewed

@@ -0,0 +1,40 @@
+module StackConfig
+    Stacks = Hash.new
+    Stacks['apache-cloud-init'] = {
+      # (we can access environment variable via ENV['foo'] instead of hard coding u/p here)
+      'REGION'      => ENV['OS_REGION_NAME'],
+      'USERNAME'    => ENV['OS_USERNAME'],
+      'PASSWORD'    => ENV['OS_PASSWORD'],
+      'AUTH_URL'    => ENV['OS_AUTH_URL'],
+      'TENANT_NAME' => ENV['OS_TENANT_NAME'],
+       # generic instance info
+       'flavor_id'  => 103,
+       'image_id'   => 78265, # CentOS 6.3 64bit
+       # per-az image_id's
+       'az-2.region-a.geo-1' => { 'image_id' => 78265 },
+       # provisioning info
+       :key_pair => ENV['USER'],
+       :key_public => '~/.ssh/id_rsa.pub',
+       :name_template => '%s-%s-%s%04d',   # service-site-role0001
+       :global_service_name => 'webci',
+       :site_template => '%s',
+       # role specification
+       # role names & chef roles should match
+       :roles => {
+         :web => {  :count => 1,
+                    # use the default security group
+                    :security_group => 'default',
+                    # don't use chef as the second-stage provisioner
+                    :skip_chef_prereg => true,
+                    :bootstrap => 'cloud-init.sh',
+                    # use the yaml template that supports configuring the ephemeral space early in the boot process
+                    :cloud_config_yaml => 'cloud-init.yaml',
+         }
+       }
+    }
+end

data/doc/examples/apache-via-cloud-init-centos/cloud-init.sh ADDED Viewed

@@ -0,0 +1,8 @@
+#!/bin/bash
+cat > /tmp/index.html <<HEREDOC
+<html><body><h1>Stack-Kicker was 'ere!</h1>
+<p>This file is dropped in place by a shell script passed to the host via cloud-init</p>
+<p>The web server software is running but no content has been added, yet.</p>
+</body></html>
+HEREDOC

data/doc/examples/apache-via-cloud-init-centos/cloud-init.yaml ADDED Viewed

@@ -0,0 +1,24 @@
+#cloud-config
+manage_etc_hosts: True
+hostname: %HOSTNAME%
+fqdn: %HOSTNAME%.mccartney.ie
+output:
+  all: ">> /var/log/cloud-init.log"
+# use the HPCS Ubuntu Mirror for security-updates too
+#bootcmd:
+#  - echo 127.0.1.1 %HOSTNAME% >> /etc/hosts
+# Run apt-get update
+package_update: true
+# Run apt-get update
+package_upgrade: true
+# Install some packages
+packages:
+ - apache2
+ - php5

data/doc/examples/apache-via-cloud-init-centos/secgroup_ips.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"web":["15.185.111.243"]}

data/lib/stack-kicker/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Stack
   module Kicker
-    VERSION = "0.0.22"
+    VERSION = "0.0.23"
   end
 end

data/lib/stack.rb CHANGED Viewed

@@ -248,20 +248,6 @@ module Stack
   def Stack.generate_knife_rb(config)
     # generate a project/.chef/knife.rb from our config
-    Stack.check_config(config)
-    # find the chef server, if we need to
-    if config[:chef_server_hostname].nil? || config[:chef_server_private].nil? || config[:chef_server_public]
-      Logger.debug { "Attempting to discover the chef server details" }
-      ours = Stack.get_our_instances(config)
-      ours.each do |node, node_details|
-        if node_details[:role] == :chef
-          Logger.debug { "Found the Chef server: #{node} #{node_details}" }
-          Stack.set_chef_server(config, node)
-        end
-      end
-    end
     # CWD shoud be chef-repo/bootstrap, so the project .chef directory should be
     dot_chef_abs = File.absolute_path(File.join(config[:stackhome],config[:dot_chef]))
@@ -636,23 +622,29 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
     # called either after we create the Chef Server, or skip over it
     Logger.debug "Setting :chef_server_hostname, chef_server_private & chef_server_public details (using #{chef_server})"
+    Stack.check_config(config)
+    Stack.get_our_instances(config)
     config[:chef_server_hostname] = chef_server
     # get the internal IP of this instance....which we should have stored in config[:all_instances]
     if config[:all_instances][chef_server] && config[:all_instances][chef_server][:addresses]
       config[:all_instances][chef_server][:addresses].each do |address|
         # find the private IP, any old private IP will do...
         if (address.label == 'private')
-          config[:chef_server_private] = "http://#{address.address}:4000/"
+          config[:chef_server_private] = "#{address.address}"
           Logger.info "Setting the internal Chef URL to #{config[:chef_server_private]}"
         end
         # only set the public url if it hasn't been set in the config
         if ((config[:chef_server_public].nil? || config[:chef_server_public].empty?) && address.label == 'public')
-          config[:chef_server_public] = "http://#{address.address}:4000/"
+          config[:chef_server_public] = "#{address.address}"
           Logger.info "Setting the public Chef URL to #{config[:chef_server_public]}"
         end
       end
     end
   end
   def Stack.secgroup_sync(config)
@@ -774,12 +766,13 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
           # 2) replace the tokens (CHEF_SERVER, CHEF_ENVIRONMENT, SERVER_NAME, ROLE)
           Logger.debug { "Replacing %HOSTNAME% with #{hostname} in multipart" }
           multipart.gsub!(%q!%HOSTNAME%!, hostname)
+          Logger.debug { "Replaced %HOSTNAME% with #{hostname} in multipart" }
           if config[:chef_server_hostname].nil?
             Logger.info  "config[:chef_server_hostname] is nil, skipping chef server substitution"
           elsif (role_details[:chef_server])
             Logger.info  "This is the Chef Server - setting up to talk to ourselves"
-            multipart.gsub!(%q!%CHEF_SERVER%!, 'http://127.0.0.1:4000/')
+            multipart.gsub!(%q!%CHEF_SERVER%!, '127.0.0.1')
             multipart.gsub!(%q!%CHEF_ENVIRONMENT%!, config[:chef_environment])
           else
             Logger.info  "Chef server is #{config[:chef_server_hostname]}, which is in #{config[:node_details][config[:chef_server_hostname]][:region]}"
@@ -794,6 +787,12 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
               Logger.warn { "Not setting the chef url for #{hostname} as neither chef_server_private or chef_server_public are valid yet" }
             end
+            if config[:domain].nil?
+              multipart.gsub!(%q!%CHEF_SERVER_HOSTNAME%!, config[:chef_server_hostname])
+            else
+              multipart.gsub!(%q!%CHEF_SERVER_HOSTNAME%!, config[:chef_server_hostname] + '.' + config[:domain])
+            end
             multipart.gsub!(%q!%CHEF_ENVIRONMENT%!, config[:chef_environment])
             if File.exists?(config[:chef_validation_pem])
@@ -867,7 +866,7 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
           # refresh the chef_server details..we should have IPs now
           if role_details[:chef_server]
             Stack.set_chef_server(config, hostname)
-            Stack.generate_knife_rb(config)
+            #Stack.generate_knife_rb(config)
           end
           # attach a floating IP to this if we have one
@@ -915,15 +914,18 @@ cookbook_path [ '<%=config[:stackhome]%>/cookbooks' ]
       raise ArgumentError
     end
+    filename_fqp = ''
+    # Relative path, to somewhere!
     dirs = [ '.' ]  # current directory
     dirs.push(config[:stackhome])
     config[:find_file_paths].each { |fp| dirs.push(File.join(config[:stackhome], fp)) }
     dirs.push(File.join(@@gemhome, 'lib'))
+    dirs.push(ENV['HOME'])
     dirs.push('')   # find absolute paths
     dirs.flatten!
     Logger.debug "find_file, looking for #{filename} in #{dirs}"
-    filename_fqp = ''
     dirs.each do |dir|
       fqp = File.join(dir, filename)
       Logger.debug "find_file: checking #{fqp}"

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-kicker
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -143,6 +143,11 @@ files:
 - doc/examples/.rvmrc
 - doc/examples/Gemfile
 - doc/examples/apache-via-chef-server/Stackfile
+- doc/examples/apache-via-cloud-init-centos/README.md
+- doc/examples/apache-via-cloud-init-centos/Stackfile
+- doc/examples/apache-via-cloud-init-centos/cloud-init.sh
+- doc/examples/apache-via-cloud-init-centos/cloud-init.yaml
+- doc/examples/apache-via-cloud-init-centos/secgroup_ips.json
 - doc/examples/apache-via-cloud-init/README.md
 - doc/examples/apache-via-cloud-init/Stackfile
 - doc/examples/apache-via-cloud-init/cloud-init.sh