mccloud 0.0.13 → 0.0.14

data/lib/mccloud/util/sshkey.rb

@@ -7,7 +7,7 @@ require 'digest/md5'
 
 module Mccloud
   module Util
-    
+
 class SSHKey
 
   def self.generate(options = {})
@@ -18,11 +18,12 @@ class SSHKey
 
   def initialize(private_key, options = {})
     @key_object        = OpenSSL::PKey::RSA.new(private_key)
+
     @comment           = options[:comment] || ""
     @rsa_private_key   = @key_object.to_pem
     @rsa_public_key    = @key_object.public_key.to_pem
     raw_ssh_public_key = ssh_public_key_conversion
-    
+
 #    @ssh_public_key    = ["ssh-rsa", Base64.strict_encode64(raw_ssh_public_key), @comment].join(" ").strip
 
     @ssh_public_key    = ["ssh-rsa", [raw_ssh_public_key].pack("m0").gsub(/\n/,''), @comment].join(" ").strip

data/lib/mccloud/version.rb

@@ -1,3 +1,6 @@
 module Mccloud
-  VERSION = "0.0.13"
+end
+
+unless defined?(Mccloud::VERSION)
+  ::Mccloud::VERSION = "0.0.14"
 end

data/lib/mccloud/vm.rb

@@ -0,0 +1,62 @@
+module Mccloud
+
+  class Vm
+
+    attr_accessor :name
+    attr_reader :env
+    attr_accessor :definition
+
+    def initialize(name,env)
+      @name=name
+      @env=env
+    end
+
+    def exists?
+      File.exists?(self.path)
+    end
+
+    def path
+      File.join(@env.config.mccloud.vm_path,@name+".rb")
+    end
+
+    def load!
+      self.validate
+
+      content=File.read(self.path)
+      mccloud_configurator=env.config
+      content.gsub!("Mccloud::Config.run","mccloud_configurator.define")
+
+      begin
+        env.config.instance_eval(content)
+      rescue Error => ex
+        raise ::Mccloud::Error, "Error reading vm from file #{definition_file}#{ex}"
+      end
+    end
+
+    def create
+      begin
+        unless self.exists?
+          File.open(self.path,'w'){ |f| f.write(self.to_template)}
+        else
+          raise ::Mccloud::Error, "VM file #{self.path} already exists"
+        end
+      rescue Error => ex
+        raise ::Mccloud::Error, "Error writing vm file"
+      end
+    end
+
+    def to_template
+      result=""
+      filename=File.expand_path(File.join(File.dirname(__FILE__),'templates','vm.erb'))
+      env.logger.info "Opening vm template file #{@file}"
+      template=File.new(filename).read
+      result=ERB.new(template).result(binding)
+      return result
+    end
+
+    def validate
+      raise ::Mccloud::Error, "Vm #{@name} does not yet exist" unless self.exists?
+    end
+  end
+end
+

data/lib/mccloud/vms.rb

@@ -0,0 +1,60 @@
+require 'mccloud/vm'
+module Mccloud
+  class Vms < Hash
+
+    attr_reader :env
+
+    def initialize(env)
+      @env=env
+    end
+
+    def define(name,definitionname)
+      # Check if definition  exists
+      unless env.config.definitions.registered?(definitionname)
+        raise ::Mccloud::Error, "Definition #{definitionname} does not exist"
+      end
+      # Create the vms dir if needed
+      unless self.exists?
+        self.create
+      end
+
+      vm=::Mccloud::Vm.new(name,env)
+      unless vm.exists?
+       vm.definition=env.config.definitions[definitionname]
+       vm.create
+      end
+    end
+
+    def load!
+      if self.exists?
+        Dir[File.join(self.path,"**.rb")].each do |dir|
+          name=File.basename(dir,'.rb')
+          vm=::Mccloud::Vm.new(name,env)
+          vm.load!
+        end
+      else
+        env.logger.info "Skipping loading of vms as the vm_path does exist"
+      end
+    end
+
+    def path
+      @env.config.mccloud.vm_path
+    end
+
+    def exists?
+      File.directory?(self.path)
+    end
+
+    def create
+     begin
+      unless self.exists?
+        env.logger.info "Creating the vms directory #{self.path} as it doesn't exist yet"
+        FileUtils.mkdir(self.path)
+      end
+      rescue Exception => ex
+         raise ::Mccloud::Error, "Error creating vms directory #{self.path}: \n#{ex}"
+      end
+    end
+
+  end
+end

data/lib/mccloud.rb

@@ -1,2 +1,25 @@
-require 'fog'
 require 'json'
+
+require 'i18n'
+require 'openssl'
+require 'pathname'
+
+module Mccloud
+  # The source root is the path to the root directory of
+  # the Mccloud gem.
+  def self.source_root
+    @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+  end
+end
+
+# # Default I18n to load the en locale
+I18n.load_path << File.expand_path("lib/mccloud/templates/locales/en.yml", Mccloud.source_root)
+
+# Load the things which must be loaded before anything else
+require 'mccloud/cli'
+require 'mccloud/ui'
+require 'mccloud/command'
+require 'mccloud/error'
+#require 'mccloud/logger'
+require 'mccloud/environment'
+require 'mccloud/version'

data/mccloud.gemspec

@@ -14,22 +14,31 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "mccloud"
 
-  s.add_dependency "net-ssh", "~> 2.1.0"
+  s.add_dependency "net-ssh", "~> 2.2.2"
   #s.add_dependency "sshkey"
   s.add_dependency "net-scp"
-  s.add_dependency "fog", "~> 0.7.2"
+   s.add_dependency "fog", ">= 1.1.0"
+
   s.add_dependency "json"
+  s.add_dependency "ansi"
+
   #s.add_dependency "templater"
   s.add_dependency "popen4", "~> 0.1.2"
-  s.add_dependency "thor", "~> 0.14.6"
+  s.add_dependency "thor", ">= 0.14.6"
   s.add_dependency "highline", "~> 1.6.1"
   #s.add_dependency "progressbar"
   #s.add_development_dependency "cucumber", "0.8.5"
 
+
   s.add_dependency "net-ssh-multi"
   #s.add_dependency "rspec"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency("ruby-libvirt","~>0.4.0")
+  s.add_development_dependency("vagrant","~>0.8.1")
+  s.add_development_dependency("rake","~>0.9")
+
+  s.add_dependency "i18n"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/samples/Mccloudfile

@@ -0,0 +1,117 @@
+Mccloud::Config.run do |config|
+  # All Mccloud configuration is done here. For a detailed explanation
+  # and listing of configuration options, please view the documentation
+  # online.
+
+  config.mccloud.prefix="mccloud"
+  config.mccloud.environment="development"
+  config.mccloud.identity="patrick"
+
+ config.vm.define "backend" do |sqr_be_config|
+   sqr_be_config.vm.provider="AWS"
+   sqr_be_config.vm.provider_options={ :region => "eu-west-1"}
+
+   #admin_config.vm.provisioner=:chef_solo
+   sqr_be_config.vm.create_options={ 
+     # ID = "ami-e59ca991" = Ubuntu 10.10 - Maverick 64-bit (Canonical/EBS) - Euwest1
+     :image_id => "ami-e59ca991" , 
+     :flavor_id => "m1.large",
+     :groups => %w(mccloud-development-patrick-securitygroup),
+     :key_name => "mccloud-key-patrick",
+     :availability_zone => "eu-west-1a" 
+   }
+   sqr_be_config.vm.forward_port("redis", 6379, 6379)
+   sqr_be_config.vm.forward_port("postgres", 5432, 5432)
+   sqr_be_config.vm.forward_port("sphinx", 9312, 9312)
+   sqr_be_config.vm.user="ubuntu"
+   sqr_be_config.vm.bootstrap="definitions/project-ubuntu/bootstrap-ubuntu-system.sh"
+   sqr_be_config.vm.key_name="mccloud-key-patrick"
+   sqr_be_config.vm.private_key="/Users/patrick/.ssh/mccloud_rsa"
+   sqr_be_config.vm.public_key="/Users/patrick/.ssh/mccloud_rsa.pub"
+   
+   sqr_be_config.vm.provision :chef_solo do |chef|
+       chef.cookbooks_path = ["../project-chefrepo/cookbooks","../project-chefrepo/site-cookbooks"]
+       chef.log_level = "debug"
+       chef.add_recipe("myapp::backend")
+       chef.json.merge!({
+    	      :myapp => {
+             :redis_host_ip => "<%= private_ips['backend'] %>",
+             :postgres_host_ip => "<%= private_ips['backend'] %>",
+             :sphinx_host_ip => "<%= private_ips['backend'] %>"
+       }})
+   end
+   
+
+ end
+ 
+ config.vm.define "frontend" do |sqr_fe_config|
+ 
+    sqr_fe_config.vm.provider="AWS"
+    sqr_fe_config.vm.provider_options={ :region => "eu-west-1"}
+
+    sqr_fe_config.vm.provisioner=:chef_solo
+    sqr_fe_config.vm.create_options={ 
+      # ID = "ami-e59ca991" = Ubuntu 10.10 - Maverick 64-bit (Canonical/EBS) - Euwest1
+      :image_id => "ami-e59ca991" , 
+      :flavor_id => "m1.large",
+      :groups => %w(mccloud-development-patrick-securitygroup),
+      :key_name => "mccloud-key-patrick",
+      :availability_zone => "eu-west-1a" 
+    }
+    sqr_fe_config.vm.forward_port("http", 8080, 8080)
+    sqr_fe_config.vm.forward_port("http", 9000, 9000)
+    sqr_fe_config.vm.user="ubuntu"
+    sqr_fe_config.vm.bootstrap="definitions/project-ubuntu/bootstrap-ubuntu-system.sh"
+    sqr_fe_config.vm.key_name="mccloud-key-patrick"
+    sqr_fe_config.vm.private_key="/Users/patrick/.ssh/mccloud_rsa"
+    sqr_fe_config.vm.public_key="/Users/patrick/.ssh/mccloud_rsa.pub"
+
+    sqr_fe_config.vm.provision :chef_solo do |chef|
+        chef.cookbooks_path = ["../project-chefrepo/cookbooks","../project-chefrepo/site-cookbooks"]
+        chef.log_level = "debug"
+        chef.add_recipe("myapp::frontend")
+        chef.json.merge!({
+     	      :myapp => {
+              :redis_host_ip => "<%= private_ips['backend'] %>",
+              :postgres_host_ip => "<%= private_ips['backend'] %>",
+              :sphinx_host_ip => "<%= private_ips['backend'] %>"
+              
+        }})
+    end
+    
+  end
+
+
+  config.vm.define "logger" do |logger_config|
+    logger_config.vm.provider="AWS"
+    logger_config.vm.provider_options={ :region => "eu-west-1"}
+
+    #admin_config.vm.provisioner=:chef_solo
+    logger_config.vm.create_options={ 
+      # ID = "ami-e59ca991" = Ubuntu 10.10 - Maverick 64-bit (Canonical/EBS) - Euwest1
+      :image_id => "ami-476d5b33" , 
+      :flavor_id => "m1.large",
+      :groups => %w(mccloud-development-patrick-securitygroup),
+      :key_name => "mccloud-key-patrick",
+      :availability_zone => "eu-west-1a" 
+    }
+    logger_config.vm.forward_port("http", 8080, 8080)
+    logger_config.vm.user="ubuntu"
+    logger_config.vm.bootstrap="definitions/project-ubuntu/bootstrap-ubuntu-system.sh"
+    logger_config.vm.key_name="mccloud-key-patrick"
+    logger_config.vm.private_key="/Users/patrick/.ssh/mccloud_rsa"
+    logger_config.vm.public_key="/Users/patrick/.ssh/mccloud_rsa.pub"
+
+    logger_config.vm.provision :chef_solo do |chef|
+        chef.cookbooks_path = ["../project-chefrepo/cookbooks","../project-chefrepo/site-cookbooks"]
+        chef.log_level = "debug"
+        chef.add_recipe("app_logger::default")
+        chef.json.merge!({
+     	      :app_logger => {
+              :redis_host_ip => "<%= private_ips['backend'] %>",
+        }})
+    end
+
+  end
+  
+end

data/samples/bitnami_drupal_cloud.json

@@ -0,0 +1,102 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+
+  "Description" : "The BitNami Drupal 7.0: Drupal is a content management platform that allows an individual or community of users to easily publish, manage, and organize a wide variety of content on a website. In general, Drupal is used for community web portals, discussion sites, corporate web sites, intranet applications, personal web sites or blogs, aficionado sites, e-commerce applications, resource directories, and social networking sites. Drupal is easy to extend by plugging in one or more of the dozens of freely available modules. For more information, please visit:  http://bitnami.org.",
+
+  "Parameters" : {
+    "BitnamiInstanceType" : {
+      "Default" : "m1.small",
+      "Type" : "String",
+      "Description" : "The type of EC2 instances: only t1.micro, m1.small and m1.medium supported"
+    },
+    "KeyName": {
+      "Description" : "Name of an existing EC2 KeyPair to enable SSH access",
+      "Type": "String",
+      "Default" : "default"
+    },
+    "BitnamiUser" : {
+      "Default" : "user",
+      "Type" : "String",
+      "Description" : "The BitNami Drupal user login"
+    },
+    "BitnamiPassword" : {
+      "Default" : "bitnami",
+      "Type" : "String",
+      "Description" : "The BitNami Drupal user password (minimum 6 characters, default value: bitnami )",
+      "NoEcho" : "TRUE"
+    },
+    "BitnamiEmail" : {
+      "Default" : "user@example.com",
+      "Description" : "The BitNami Drupal user email",
+      "Type" : "String"
+    },
+    "BitnamiUserName" : {
+      "Default" : "BitNami User",
+      "Description" : "The BitNami Drupal user full name",
+      "Type" : "String"
+    }
+  },
+  "Resources" : {
+    "BitnamiSecurityGroup" : {
+      "Type" : "AWS::EC2::SecurityGroup",
+      "Properties" : {
+        "GroupDescription" : "Allow HTTP/SSH to BitNami machine.",
+        "SecurityGroupIngress" : [ {
+          "IpProtocol" : "tcp",
+          "FromPort" : "80",
+          "ToPort" : "80",
+          "CidrIp" : "0.0.0.0/0"
+        }, {
+          "IpProtocol" : "tcp",
+          "FromPort" : "22",
+          "ToPort" : "22",
+          "CidrIp" : "0.0.0.0/0"
+        } ]
+      }
+    },
+    "BitnamiServer" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "ImageId" : { "Fn::FindInMap": [ "AWSRegionArch2AMI", { "Ref": "AWS::Region" }, { "Fn::FindInMap": [ "AWSInstanceType2Arch", {"Ref": "BitnamiInstanceType" },"Arch" ] } ]},
+        "KeyName" : {"Ref": "KeyName"},
+        "SecurityGroups" : [ { "Ref" : "BitnamiSecurityGroup" } ],
+        "UserData" : { "Fn::Base64" : { "Fn::Join" : [ "\n", [ 
+        { "Fn::Join" : [ "=", [ "base_user", { "Ref" : "BitnamiUser" } ] ] }, 
+        { "Fn::Join" : [ "=", [ "base_mail", { "Ref" : "BitnamiEmail" } ] ] }, 
+        { "Fn::Join" : [ "=", [ "base_user_name", { "Ref" : "BitnamiUserName" } ] ] }, 
+        { "Fn::Join" : [ "=", [ "base_password", { "Ref" : "BitnamiPassword" } ] ] },
+        { "Fn::Join" : [ "=", [ "stack_name", "drupal" ] ] },
+        { "Fn::Join" : [ "=", [ "stack_version", "7.0-0" ] ] }
+         ] ] } },
+        "InstanceType" : { "Ref" : "BitnamiInstanceType" },
+        "Tags" : [ {
+          "Key" : "Name",
+          "Value" : "The BitNami Drupal 7.0"
+        } ]
+      }
+    },
+    "BitnamiIP" : {
+      "Type" : "AWS::EC2::EIP",
+      "Properties" : {
+        "InstanceId" : { "Ref" : "BitnamiServer" }
+      }
+    }
+
+  },
+  "Mappings": {
+    "AWSInstanceType2Arch" : {
+      "t1.micro"    : { "Arch" : "32" },
+      "m1.small"    : { "Arch" : "32" },
+      "c1.medium"   : { "Arch" : "32" }
+    },
+    "AWSRegionArch2AMI" : {
+      "us-east-1" : { "32" : "ami-986497f1"} 
+    }
+  },
+  "Outputs" : {
+    "URL" : {
+      "Description" : "URL of the BitNami Drupal 7.0 server:",
+      "Value" : { "Fn::Join" : [ "", [ "http://", { "Ref" : "BitnamiIP" } ] ] }
+    }
+  }
+}

data/samples/bootstrap-ubuntu-system.sh

@@ -0,0 +1,16 @@
+#!/bin/bash -e
+
+apt-get update
+apt-get -y install ruby ruby-dev libopenssl-ruby rdoc ri irb build-essential wget ssl-cert
+cd /tmp
+test ! -f rubygems-1.3.7.tgz && wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+test -f rubygems-1.3.7.tgz && tar zxf rubygems-1.3.7.tgz
+
+gem --version |grep 1.3.7 | wc -l |grep 0 && cd rubygems-1.3.7 && ruby setup.rb --no-format-executable
+
+gem list chef|grep chef|wc -l | grep 0 && gem install chef --no-ri --no-rdoc
+gem list puppet|grep puppet|wc -l | grep 0 && gem install puppet --no-ri --no-rdoc
+
+useradd puppet
+
+echo "bootstrap finished"

data/samples/mcollective_cloud.json

@@ -0,0 +1,198 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+
+  "Description" : "Marionette Collective 1.0.1 demo network with 1 ActiveMQ broker and 5 managed instances",
+
+  "Parameters" : {
+    "KeyName" : {
+      "Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
+      "Type" : "String"
+    },
+
+    "Password" : {
+      "Description" : "Password for ActiveMQ",
+      "NoEcho": "true",
+      "Type" : "String"
+    },
+
+    "PSK" : {
+      "Description" : "Pre Shared Key for MCollective",
+      "NoEcho": "true",
+      "Type" : "String"
+    }
+  },
+
+  "Resources" : {
+    "ActiveMQInstance" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "InstanceType" : "m1.small",
+        "SecurityGroups" : [ { "Ref" : "ActiveMQSecurityGroup" } ],
+        "AvailabilityZone" : "eu-west-1b",
+	"ImageId" : "ami-3fb4804b",
+        "KeyName" : { "Ref" : "KeyName" },
+	"Tags" : [ { "Key" : "Name",
+		     "Value" : "management_node"
+		 } ],
+        "UserData" : {"Fn::Base64" :
+	                 {"Fn::Join": [ "\n", [
+			                         "mcollective=server",
+			                         {"Fn::Join": [ "", ["mcollective_password=", { "Ref": "Password" }]]},
+			                         {"Fn::Join": [ "", ["mcollective_psk=", { "Ref": "PSK" }]]}
+					      ]
+				      ]
+
+			 }
+	             }
+      }
+    },
+
+    "ManagedInstance1" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "InstanceType" : "m1.small",
+        "AvailabilityZone" : "eu-west-1b",
+        "SecurityGroups" : [ { "Ref" : "ActiveMQSecurityGroup" } ],
+	"ImageId" : "ami-3fb4804b",
+        "KeyName" : { "Ref" : "KeyName" },
+	"Tags" : [ { "Key" : "Name",
+		     "Value" : "node1"
+		 } ],
+        "UserData" : {"Fn::Base64" :
+	                 {"Fn::Join": [ "\n", [
+			                         {"Fn::Join": [ "", ["mcollective=", {"Fn::GetAtt": [ "ActiveMQInstance", "PublicIp"  ]}]] },
+			                         {"Fn::Join": [ "", ["mcollective_password=", { "Ref": "Password" }]]},
+			                         {"Fn::Join": [ "", ["mcollective_psk=", { "Ref": "PSK" }]]}
+					      ]
+				      ]
+
+			 }
+	             }
+      }
+    },
+
+    "ManagedInstance2" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "InstanceType" : "m1.small",
+        "AvailabilityZone" : "eu-west-1b",
+        "SecurityGroups" : [ { "Ref" : "ActiveMQSecurityGroup" } ],
+	"ImageId" : "ami-3fb4804b",
+        "KeyName" : { "Ref" : "KeyName" },
+	"Tags" : [ { "Key" : "Name",
+		     "Value" : "node2"
+		 } ],
+        "UserData" : {"Fn::Base64" :
+	                 {"Fn::Join": [ "\n", [
+			                         {"Fn::Join": [ "", ["mcollective=", {"Fn::GetAtt": [ "ActiveMQInstance", "PublicIp"  ]}]] },
+			                         {"Fn::Join": [ "", ["mcollective_password=", { "Ref": "Password" }]]},
+			                         {"Fn::Join": [ "", ["mcollective_psk=", { "Ref": "PSK" }]]}
+					      ]
+				      ]
+
+			 }
+	             }
+      }
+    },
+
+    "ManagedInstance3" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "InstanceType" : "m1.small",
+        "AvailabilityZone" : "eu-west-1a",
+        "SecurityGroups" : [ { "Ref" : "ActiveMQSecurityGroup" } ],
+	"ImageId" : "ami-3fb4804b",
+        "KeyName" : { "Ref" : "KeyName" },
+	"Tags" : [ { "Key" : "Name",
+		     "Value" : "node3"
+		 } ],
+        "UserData" : {"Fn::Base64" :
+	                 {"Fn::Join": [ "\n", [
+			                         {"Fn::Join": [ "", ["mcollective=", {"Fn::GetAtt": [ "ActiveMQInstance", "PublicIp"  ]}]] },
+			                         {"Fn::Join": [ "", ["mcollective_password=", { "Ref": "Password" }]]},
+			                         {"Fn::Join": [ "", ["mcollective_psk=", { "Ref": "PSK" }]]}
+					      ]
+				      ]
+
+			 }
+	             }
+      }
+    },
+
+    "ManagedInstance4" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "InstanceType" : "m1.small",
+        "AvailabilityZone" : "eu-west-1a",
+        "SecurityGroups" : [ { "Ref" : "ActiveMQSecurityGroup" } ],
+	"ImageId" : "ami-3fb4804b",
+        "KeyName" : { "Ref" : "KeyName" },
+	"Tags" : [ { "Key" : "Name",
+		     "Value" : "node4"
+		 } ],
+        "UserData" : {"Fn::Base64" :
+	                 {"Fn::Join": [ "\n", [
+			                         {"Fn::Join": [ "", ["mcollective=", {"Fn::GetAtt": [ "ActiveMQInstance", "PublicIp"  ]}]] },
+			                         {"Fn::Join": [ "", ["mcollective_password=", { "Ref": "Password" }]]},
+			                         {"Fn::Join": [ "", ["mcollective_psk=", { "Ref": "PSK" }]]}
+					      ]
+				      ]
+
+			 }
+	             }
+      }
+    },
+
+    "ManagedInstance5" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "InstanceType" : "m1.small",
+        "AvailabilityZone" : "eu-west-1a",
+        "SecurityGroups" : [ { "Ref" : "ActiveMQSecurityGroup" } ],
+	"ImageId" : "ami-3fb4804b",
+        "KeyName" : { "Ref" : "KeyName" },
+	"Tags" : [ { "Key" : "Name",
+		     "Value" : "node5"
+		 } ],
+        "UserData" : {"Fn::Base64" :
+	                 {"Fn::Join": [ "\n", [
+			                         {"Fn::Join": [ "", ["mcollective=", {"Fn::GetAtt": [ "ActiveMQInstance", "PublicIp"  ]}]] },
+			                         {"Fn::Join": [ "", ["mcollective_password=", { "Ref": "Password" }]]},
+			                         {"Fn::Join": [ "", ["mcollective_psk=", { "Ref": "PSK" }]]}
+					      ]
+				      ]
+
+			 }
+	             }
+      }
+    },
+
+    "ActiveMQSecurityGroup" : {
+      "Type" : "AWS::EC2::SecurityGroup",
+      "Properties" : {
+        "GroupDescription" : "Enable SSH and ActiveMQ access",
+        "SecurityGroupIngress" : [
+	  {
+            "IpProtocol" : "tcp",
+            "FromPort" : "22",
+            "ToPort" : "22",
+            "CidrIp" : "0.0.0.0/0"
+          },
+	  {
+            "IpProtocol" : "tcp",
+            "FromPort" : "6163",
+            "ToPort" : "6163",
+            "CidrIp" : "0.0.0.0/0"
+	  }
+	  ]
+      }
+    }
+  },
+
+  "Outputs": {
+    "ManagementConsole": {
+      "Value" : { "Fn::GetAtt" : [ "ActiveMQInstance", "PublicIp" ] },
+      "Description" : "Address for the management instance"
+    }
+  }
+}