edurange 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c490c151e7f4415ff2e78c6925ffbbdbda92aa28
-  data.tar.gz: 4bf4867ce8b771df64b34e97b75cc4dfbadfb87b
+  metadata.gz: 84add8c428114057bddd20bc191626c0060f12da
+  data.tar.gz: 3f3b5068afc75d32f0f9c39a45bc98076aadd7f8
 SHA512:
-  metadata.gz: e51a39229cbaa65a08d16c538c8f47545c270f1abdbd15d70ca9058846e28b543be55e9c4141614f77bffa2423c0d63edd74085f9c860e35d78a58d54360dec0
-  data.tar.gz: 7cecb8da73e3534528f35a1c3e74171d0c67902c900b15c05bcb766a08059f461a99c0d90bdc0cbbeac15a4ac4bbdcfdc763e9c014f3b919dbcdc78a5dbd515e
+  metadata.gz: 24060ef13116c65de73a80849506c1d43ec526f1f6a319fd3ad14e17b8a7dafee2df98d647669aba1eb7c034dd6cb675abd5e7f9423acf992f8abb80318e4311
+  data.tar.gz: 266e17e47768410aaddb6bd8e5b06c16df15f4b5631509fd5bbc620472c97acee668793f2fe6cbad09d9b566533bc01b9fcfc468af60a1076943aea395f31326

data/bin/edurange

@@ -2,6 +2,10 @@
 require 'edurange'
 
 yaml_file = ARGV.shift
+if yaml_file.nil?
+  puts "Must provide config file"
+  exit -1
+end
 Edurange::Init.init(yaml_file)
 
 

data/bin/edurange-setup

@@ -9,6 +9,11 @@ File.open('config.yml', "w") do |file|
 end
 
 
+# Puppetmaster install
+# .ec2 folder
+# EC2_home and such
+# java
+
 
 
 

data/lib/edurange.rb

@@ -19,15 +19,12 @@ module Edurange
         firewall_rules = node[3]
         packages = node[4]
         puts "Preparing #{node_name} - Packages: #{packages} ami_id: #{ami_id}"
-        puts "Got users: #{users} and fw rules: #{firewall_rules}"
         certs = Edurange::PuppetMaster.gen_client_ssl_cert() 
         conf = Edurange::PuppetMaster.generate_puppet_conf(certs[0])
         facts = Edurange::Parser.facter_facts(certs[0], packages)
         Edurange::PuppetMaster.write_shell_config_file(our_ssh_key,puppetmaster_ip, certs, conf, facts)
 
         users_script = self.users_to_bash(users)
-        p users_script
-        puts 'user_script above...'
         Edurange::PuppetMaster.append_to_config(users_script)
 
         

data/lib/edurange/edu_machine.rb

@@ -18,6 +18,7 @@ module Edurange
     def run(command)
       # runs an ec2 command with full path.
       command = EC2_UTILS_PATH + command
+      puts "Creating instance (ami id: #{@ami_id})"
       `#{command}`
     end
 
@@ -26,7 +27,6 @@ module Edurange
 
       # Create & run instance, setting instance_id and IP to match the newly created ami
       command = "ec2-run-instances #{@ami_id} -t #{@vm_size} --region us-east-1 --key #{@key_name} --user-data-file my-user-script.sh"
-      puts "Would run: #{command}"
       self.run(command)
       @instance_id = self.get_last_instance_id()
       puts "Waiting for instance #{@instance_id} to spin up..."
@@ -38,7 +38,6 @@ module Edurange
     def update_ec2_info
       command = "ec2-describe-instances | grep INSTANCE | grep '#{@instance_id}'"
       vm = self.run(command).split("\t")
-      p vm
       @ip_address = vm[17] # public ip
       @hostname = vm[3] # ec2 hostname
     end

data/lib/edurange/puppet_master.rb

@@ -5,10 +5,10 @@ module Edurange
     end
     def self.get_our_ssh_key
       # make some ssh keys
-      `ssh-keygen -t rsa -f #{ENV['HOME']}/.ssh/id_rsa -N '' -q` unless File.exists?("#{ENV['HOME'}/.ssh/id_rsa")
+      `ssh-keygen -t rsa -f #{ENV['HOME']}/.ssh/id_rsa -N '' -q` unless File.exists?("#{ENV['HOME']}/.ssh/id_rsa")
       # return our public key
 
-      file = File.open("#{ENV["HOME"]}/.ssh/id_rsa.pub", "rb")
+      file = File.open("#{ENV['HOME']}/.ssh/id_rsa.pub", "rb")
       contents = file.read
     end
 
@@ -29,10 +29,10 @@ module Edurange
       end
     end
     def self.write_puppet_conf(instance_id, conf)
-      File.open("/home/ubuntu/edurange/derp.pp", "w") do |file|
+      File.open("#{ENV['HOME']}/edurange/derp.pp", "w") do |file|
         file.write(conf)
       end
-      `sudo mv /home/ubuntu/edurange/derp.pp /etc/puppet/manifests/#{instance_id}#{Time.now.to_s.gsub(' ','')}.pp`
+      `sudo mv #{ENV['HOME']}/edurange/derp.pp /etc/puppet/manifests/#{instance_id}#{Time.now.to_s.gsub(' ','')}.pp`
     end
     def self.write_shell_config_file(ssh_key, puppetmaster_ip, certs, puppet_conf, facter_facts)
       File.open("my-user-script.sh", 'w') do |file|

data/lib/edurange/version.rb

@@ -1,3 +1,3 @@
 module Edurange
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edurange
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stefan Boesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies: []
 description: EDURange Project
 email: