mccloud 0.0.2 → 0.0.3

data/lib/mccloud/command/multi.rb

@@ -7,6 +7,7 @@ module Mccloud
     def multi(selection=nil,command="who am i",options=nil)
       trap("INT") { puts "we hit CTRL_C"; exit }
       
+      
       Net::SSH::Multi.start do |session|
          # Connect to remote machines
          ip2name=Hash.new
@@ -18,6 +19,12 @@ module Mccloud
            end
          end
 
+         unless options["sudo"].nil?
+           #check vm.sudo
+           sudo_cmd="sudo"
+           command="#{sudo_cmd} #{command}"
+         end
+
         puts "Executing #{command}"
         begin
          session.exec("#{command}") do |ch, stream, data|

data/lib/mccloud/command/provision.rb

@@ -5,6 +5,7 @@ module Mccloud
 
     def provision(selection=nil,options=nil)
       on_selected_machines(selection) do |id,vm|
+        
         instance=vm.instance
         instance.private_key_path=vm.private_key
         instance.username = vm.user
@@ -13,9 +14,11 @@ module Mccloud
         provisioner=@session.config.provisioners[vm.provisioner.to_s]
         if provisioner.nil?
           # We take the first provisioner defined
-          provisioner=@session.config.provisioners.first[1]
+          #provisioner=@session.config.provisioners.first[1]
+        else
+          puts "Starting provisioning on #{vm.name} with #{vm.provisioner} as provisioner"
+          provisioner.run(vm)
         end
-        provisioner.run(vm)
       end
       ##on_selected_machines(selection) do |id,vm|
       #instance=PROVIDER.servers.get(id)

data/lib/mccloud/command/server.rb

@@ -4,6 +4,7 @@ module Mccloud
   module Command
     def server(selection=nil,options=nil)
       
+      puts "Starting server mode"
       trap("INT") { puts "You've hit CTRL-C . Stopping server now"; exit }
       threads = []
       on_selected_machines(selection) do |id,vm|
@@ -14,17 +15,21 @@ module Mccloud
             ssh_options={ :keys => [ vm.private_key ], :paranoid => false, :keys_only => true}
             Net::SSH.start(public_ip_address, vm.user, ssh_options) do |ssh|
               vm.forwardings.each do |forwarding|
-                puts "forwarding port #{forwarding.remote} from #{vm.name} to local port #{forwarding.local}"
-                ssh.forward.local(forwarding.local, private_ip_address,forwarding.remote)
+                begin
+                  puts "Forwarding remote port #{forwarding.remote} from #{vm.name} to local port #{forwarding.local}"
+                  ssh.forward.local(forwarding.local, private_ip_address,forwarding.remote)
+                rescue Errno::EACCES
+                  puts "  Error - Access denied to forward remote port #{forwarding.remote} from #{vm.name} to local port #{forwarding.local}"
+                end
               end
               ssh.loop { true }
             end
           end
         end
       end
-#      threads.each {|thr| thr.join}
-      puts "and we continue here"
-      sleep 30
+      threads.each {|thr| thr.join}
+      #puts "and we continue here"
+      #sleep 30
     end
   end
 end

data/lib/mccloud/command/ssh.rb

@@ -17,6 +17,10 @@ module Mccloud
     
     name=selection
     vm=@session.config.vms[name]
+    if vm.instance.nil?
+      puts "#{name} is not available anymore"
+      return
+    end
     if vm.instance.state != "running"
       puts "#{name} is not running, move along"
       return
@@ -36,7 +40,9 @@ module Mccloud
       pid = fork if Mccloud::Util::Platform.leopard? || Mccloud::Util::Platform.tiger?
 
       command_exec="ssh #{command_options.join(" ")} #{options[:username]}@#{options[:host]} #{extra_command}".strip
-      puts "#{command_exec}"
+      
+      puts "Executing - #{command_exec}"
+      puts
       Kernel.exec command_exec if pid.nil?
       Process.wait(pid) if pid
     end

data/lib/mccloud/command/status.rb

@@ -2,11 +2,13 @@ module Mccloud
   module Command
     def status(selection=nil,options=nil)
 
-      printf "%-10s %-12s %-20s %-15s %-8s\n", "Name", "Instance Id", "IP", "Type","Status"
-      80.times { |i| printf "=" } ; puts
-
       unless options.verbose?
-        filter=@session.config.mccloud.prefix
+
+        filter=@session.config.mccloud.filter
+        puts "Using Filter: #{filter}"
+
+        printf "%-10s %-12s %-20s %-15s %-8s\n", "Name", "Instance Id", "IP", "Type","Status"
+        80.times { |i| printf "=" } ; puts
       else
         filter=""
       end
@@ -21,8 +23,15 @@ module Mccloud
             if name.start_with?(filter)
               unless filter==""
                 name[filter+" - "]=""
+                printf "%-10s %-12s %-20s %-15s %-8s\n",name,vm.id, vm.public_ip_address, vm.flavor.name,vm.state
+              else
+                puts "Name: #{name}"
+                puts "Instance Id: #{vm.id}"
+                puts "Public Ip: #{vm.public_ip_address}"
+                puts "Flavor: #{vm.flavor.name}"
+                puts "State: #{vm.state}"
+                80.times { |i| printf "=" } ; puts
               end
-              printf "%-10s %-12s %-20s %-15s %-8s\n",name,vm.id, vm.public_ip_address, vm.flavor.name,vm.state
             end
           end #End 1 provider
         end #providers

data/lib/mccloud/command/up.rb

@@ -10,26 +10,23 @@ module Mccloud
 
         provider=@session.config.providers[vm.provider]
         if (id.nil?)
-          puts "Machine #{vm.name} doesn't yet exist"
           provider_options=vm.provider_options
           boxname=vm.name
           puts "Spinning up a new machine called #{boxname}"
           
           provider_options=provider_options.merge({ :private_key_path => vm.private_key , :public_key_path => vm.public_key, :username => vm.user})
           
-          #pp provider_options 
-          instance=provider.servers.bootstrap(provider_options)
+          #instance=provider.servers.bootstrap(provider_options)
 
-          #instance=provider.servers.create(provider_options)
+          instance=provider.servers.create(provider_options)
           #instance=provider.servers.create(provider_options)
           
-          puts "Waiting for it the machine to become accessible"
+          puts "Waiting for the machine to become accessible"
           instance.wait_for { printf "."; STDOUT.flush;  ready?}
           puts
-          prefix=@session.config.mccloud.prefix
-
-
-          provider.create_tags(instance.id, { "Name" => "#{prefix} - #{boxname}"})
+          filter=@session.config.mccloud.filter
+    
+          provider.create_tags(instance.id, { "Name" => "#{filter} - #{boxname}"})
 
           # Resetting the in memory model of the new machine
           @all_servers[boxname.to_s]=instance.id
@@ -39,6 +36,8 @@ module Mccloud
 
           # Wait for ssh to become available ...
           puts "Waiting for ssh to be come available"
+          #puts instance.console_output.body["output"]
+
           Mccloud::Util.execute_when_tcp_available(instance.public_ip_address, { :port => 22, :timeout => 60 }) do
             puts "Ok, ssh is available , proceeding with bootstrap"
           end
@@ -48,12 +47,12 @@ module Mccloud
         else 
           state=vm.instance.state
           if state =="stopped"
-            puts "Machine #{vm.name} was stopped -> starting it again"
+            puts "Booting up machine #{vm.name}"
             vm.instance.start
             vm.instance.wait_for { printf ".";STDOUT.flush;  ready?}  
             puts        
           else
-            puts "Machine #{selection} already exists but is currently in state #{state} "
+            puts "Machine #{selection} is already running."
           end
         end
 

data/lib/mccloud/configurator/mccloud.rb

@@ -2,12 +2,32 @@ module Mccloud
   module Configurator
     class MccloudConfigurator
       attr_accessor :prefix
+      attr_accessor :environment
+
+      attr_accessor :identity
       attr_accessor :loglevel
       
       def initialize()
           @prefix="mccloud"
+          @environment=""
+          @identity=""
           @loglevel=:info
-      end      
+      end   
+      
+      def filter()
+        mcfilter=Array.new
+        if !@prefix.nil? 
+           mcfilter << @prefix 
+        end
+        if @environment!="" 
+           mcfilter << @environment
+        end
+        if @identity!=""
+           mcfilter << @identity 
+        end
+        return mcfilter.join(" - ")
+      end  
+       
     end
   end
 end

data/lib/mccloud/generators.rb

@@ -11,11 +11,24 @@ module Mccloud
 
       desc <<-DESC
       Initialize a mccloud environment 
-      mccloud init
+      mccloud init [ --imageId=ID]
       DESC
 
-#      first_argument :ami_id, :required => true, :desc => 'AMI ID'
- 
+      option :mcPrefix, :required => true, :desc => 'Mccloud Prefix'
+      option :mcEnvironment, :required => true, :desc => 'Mccloud Environment'
+      option :mcIdentity, :required => true, :desc => 'Mccloud Identity'
+
+      option :imageId, :required => true, :desc => 'Image ID'
+      option :userName, :required => true, :desc => 'User Name'
+      option :flavorId, :required => true, :desc => 'Flavor Id'
+      option :providerId, :required => true, :desc => 'Provider Id'
+      option :securityGroup, :required => true, :desc => 'Security Group' 
+      option :keyName, :required => true, :desc => 'Key Name' 
+      option :publicKeyPath, :required => false, :desc => 'Path to Public Key' 
+      option :privateKeyPath, :required => true, :desc => 'Path to Private Key' 
+
+      option :availabilityZone, :required => true, :desc => 'Availability Zone' 
+       
       template :mccloudfile, 'Mccloudfile'
                 
     end

data/lib/mccloud/provisioner/chef_solo.rb

@@ -44,8 +44,11 @@ module Mccloud
         
         puts "Running chef-solo"
         options={ :port => 22, :keys => [ vm.private_key ], :paranoid => false, :keys_only => true}
-        Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"sudo chef-solo -c /tmp/solo.rb -j /tmp/dna.json -l debug")
-        
+        if vm.user=="root"
+          Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"sudo chef-solo -c /tmp/solo.rb -j /tmp/dna.json -l debug")
+        else
+          Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"chef-solo -c /tmp/solo.rb -j /tmp/dna.json -l debug")
+        end
       end
       # Returns the run list for the provisioning
       def run_list

data/lib/mccloud/provisioner/puppet.rb

@@ -27,12 +27,16 @@ module Mccloud
 #            Mccloud::Util.rsync(path,vm,vm.instance)
 #        end
         vm.instance.ssh("mkdir -p #{@pp_path}")
+        puts "Synching manifest #{@manifest_file}"
         vm.instance.scp(@manifest_file,"#{@pp_path}/manifest.pp")      
         
         puts "Running puppet"
         options={ :port => 22, :keys => [ vm.private_key ], :paranoid => false, :keys_only => true}
-        Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"sudo puppet #{@pp_path}/manifest.pp")
-        
+        if vm.user=="root"
+          Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"puppet #{@pp_path}/manifest.pp")
+        else
+          Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"sudo puppet #{@pp_path}/manifest.pp")
+        end
       end
     end #Class
   end #Module Provisioners

data/lib/mccloud/session.rb

@@ -41,7 +41,7 @@ module Mccloud
 
     def initialize(options=nil)
       @logger = Logger.new(STDOUT)
-      @logger.level = Logger::DEBUG
+      @logger.level = Logger::INFO
 
       #http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc/classes/Logger.html
       @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
@@ -120,6 +120,7 @@ module Mccloud
             fogfile=File.new("#{File.join(ENV['HOME'],".fog")}","w")
             fogfile.puts "#{snippet}"
             fogfile.close
+            FileUtils.chmod(0600,fogfile)
           else
             puts "Ok, we won't write it, but we continue with your credentials in memory"
             exit -1
@@ -132,23 +133,28 @@ module Mccloud
               exit -1
           end
         end
+   
+   
+   
+   
+   
       end
       end
 
       invalid_cache=false
       @session.config.vms.each do |name,vm|
-        prefix=@session.config.mccloud.prefix
+        filter=@session.config.mccloud.filter
         id=@all_servers["#{name.to_s}"]
 
         #Check if not destroyed or something else
         instance=vm.instance
         if instance.nil?
-          @logger.error "Cache is invalid"
+          @logger.debug "Cache is invalid"
           invalid_cache=true
         else  
           if instance.state == "shutting-down" || instance.state == "terminated"
-            @logger.info "parsing .mccloud json" 
-            @logger.info "rebuilding cache"
+            @logger.debug "parsing .mccloud json" 
+            @logger.debug "rebuilding cache"
             invalid_cache=true
           end
         end
@@ -172,10 +178,10 @@ module Mccloud
           end
           servers_by_provider[name]=server_list
         end
-        prefix=@session.config.mccloud.prefix
+        filter=@session.config.mccloud.filter
 
         @session.config.vms.each do |name,vm|
-          id=servers_by_provider[vm.provider]["#{prefix} - #{name.to_s}"]
+          id=servers_by_provider[vm.provider]["#{filter} - #{name.to_s}"]
 
 
           if !id.nil?

data/lib/mccloud/templates/bootstrap-centos-rubysource-1.8.7.sh

@@ -0,0 +1,26 @@
+#http://www.catapult-creative.com/2009/02/04/installing-rails-on-centos-5/
+
+yum install -y httpd-devel openssl-devel zlib-devel gcc gcc-c++ curl-devel expat-devel gettext-devel
+
+mkdir /usr/local/src
+cd /usr/local/src
+curl -O ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz
+tar xzvf ruby-1.8.7-p72.tar.gz
+cd ruby-1.8.7-p72
+./configure --enable-shared --enable-pthread
+make
+make install
+
+
+cd /usr/local/src
+wget http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz
+tar xzvf rubygems-1.3.5.tgz
+cd rubygems-1.3.5
+ruby setup.rb
+gem install rubygems-update
+update_rubygems
+
+
+gem install chef --no-ri --no-rdoc
+gem install puppet --no-ri --no-rdoc
+

data/lib/mccloud/templates/bootstrap-centos-rvm-1.8.7.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+yum install -y bash curl git
+bash < <(curl -s -B https://rvm.beginrescueend.com/install/rvm)
+yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel lib
+yaml-devel libffi-devel openssl-devel
+source /usr/local/rvm/scripts/rvm
+rvm install ruby-1.8.7
+rvm use 1.8.7 --default
+
+gem install chef --no-ri --no-rdoc
+gem install puppet --no-ri --no-rdoc

data/lib/mccloud/templates/bootstrap-centos-rvm-1.9.2.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+yum install -y bash curl git
+bash < <(curl -s -B https://rvm.beginrescueend.com/install/rvm)
+yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel lib
+yaml-devel libffi-devel openssl-devel
+source /usr/local/rvm/scripts/rvm
+rvm install ruby-1.9.2
+rvm use 1.9.2 --default
+
+gem install chef --no-ri --no-rdoc
+gem install puppet --no-ri --no-rdoc

data/lib/mccloud/templates/bootstrap-centos-rvm-ree-1.8.7.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+yum install -y bash curl git
+bash < <(curl -s -B https://rvm.beginrescueend.com/install/rvm)
+yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel lib
+yaml-devel libffi-devel openssl-devel
+source /usr/local/rvm/scripts/rvm
+rvm install ree-1.8.7
+rvm use ree-1.8.7 --default
+
+gem install chef --no-ri --no-rdoc
+gem install puppet --no-ri --no-rdoc

data/lib/mccloud/templates/bootstrap-custom.sh

@@ -0,0 +1 @@
+# This is an empty bootstrap , ready for you to customize!

data/lib/mccloud/templates/bootstrap-ubuntu-rvm-1.8.7.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -ex
+
+apt-get update
+apt-get -y install libopenssl-ruby  build-essential wget ssl-cert
+
+bash < <(curl -s -B https://rvm.beginrescueend.com/install/rvm)
+source /usr/local/rvm/scripts/rvm
+
+rvm install 1.8.7
+rvm use 1.8.7 --default
+
+gem install chef --no-ri --no-rdoc
+gem install puppet --no-ri --no-rdoc
+

data/{ruby-bootstrap.sh → lib/mccloud/templates/bootstrap-ubuntu-system.sh}

@@ -7,5 +7,4 @@ test ! -f rubygems-1.3.7 && wget http://production.cf.rubygems.org/rubygems/ruby
 test -f rubygems-1.3.7.tgz && tar zxf rubygems-1.3.7.tgz
 cd rubygems-1.3.7 && ruby setup.rb --no-format-executable
 gem install chef --no-ri --no-rdoc
-gem install puppet --no-ri --no-rdoc
-
+gem install puppet --no-ri --no-rdoc