dev-lxc 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 864064b9723364e779abf93415aa8cbf64f9f743
-  data.tar.gz: 6d969f2f41568feda063c4baa2e1161fe797e4d7
+  metadata.gz: 3c4caf061044c84378f0ddc6f2b230bf471316bd
+  data.tar.gz: 38604c98358572ef9c01cdf0b5bb3c123d12909e
 SHA512:
-  metadata.gz: b3eb932287776d238b13e33effdf81579382467b09bff068a3da56c48903be539cc5f02f80e6431d2de96ac3545add1f241c8c4b8d35349c1260e1d3351ac37a
-  data.tar.gz: f4569376b362d19c33ed84d177a644230c45556b0b76a95a517927cf710bf917213dbb101188c2e8242e56e428e83e3763f31b68825c68234a6d540227c0f15c
+  metadata.gz: 3f21d2ec078c477fb6d1d3c2bed8329ecc2d09dba2f2f9e5f2683ca73fc7ae40b6992d687588b0478b5fc149e6e30c4fbd8323dcfa5ece1fb36d8224aea5881f
+  data.tar.gz: a4045af580cc0c357c6799ef29e4eb0b8785ec40a431897e63976b4cdd6394e26ebadebaaf08b763937118b54f9af3bb11a2d927193d6eb67d92f2585c7e8743

data/lib/dev-lxc/cli.rb

@@ -77,8 +77,9 @@ module DevLXC::CLI
 
     desc "chef-repo", "Creates a `bootstrap-node` script and chef-repo in the current directory using files from the cluster's backend /root/chef-repo"
     option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    option :pivotal, :aliases => "-p", :type => :boolean, :desc => "Also copy pivotal.rb and pivotal.pem"
     def chef_repo
-      get_cluster(options[:config]).chef_repo
+      get_cluster(options[:config]).chef_repo(options[:pivotal])
     end
 
     desc "list_images [SERVER_NAME_REGEX]", "List of each servers' images created during the build process"

data/lib/dev-lxc/cluster.rb

@@ -58,7 +58,7 @@ module DevLXC
       servers = chef_servers + analytics_servers
     end
 
-    def chef_repo
+    def chef_repo(copy_pivotal=false)
       if @chef_server_bootstrap_backend.nil?
         puts "A bootstrap backend Chef Server is not defined in the cluster's config. Please define it first."
         exit 1
@@ -76,34 +76,47 @@ module DevLXC
       if pem_files.empty?
         puts "The pem files can not be copied because they do not exist in '#{chef_server.server.name}' Chef Server's `/root/chef-repo/.chef` directory"
       else
+        pem_files.delete_if { |pem_file| pem_file.end_with?("/pivotal.pem") } unless copy_pivotal
         FileUtils.cp( pem_files, "./chef-repo/.chef" )
       end
 
       if @chef_server_topology == "open-source"
         chef_server_url = "https://#{@api_fqdn}"
-        username = "admin"
         validator_name = "chef-validator"
       else
+        chef_server_root = "https://#{@api_fqdn}"
         chef_server_url = "https://#{@api_fqdn}/organizations/ponyville"
-        username = "rainbowdash"
         validator_name = "ponyville-validator"
-      end
-
-      knife_rb = %Q(
-current_dir = File.dirname(__FILE__)
-
-chef_server_url "#{chef_server_url}"
 
-node_name "#{username}"
-client_key "\#{current_dir}/#{username}.pem"
-
-validation_client_name "#{validator_name}"
-validation_key "\#{current_dir}/#{validator_name}.pem"
+        if copy_pivotal
+          if File.exists?("./chef-repo/.chef/pivotal.rb")
+            puts "Skipping pivotal.rb because it already exists in `./chef-repo/.chef`"
+          else
+            pivotal_rb_path = "#{chef_server.abspath('/root/chef-repo/.chef')}/pivotal.rb"
+            if File.exists?(pivotal_rb_path)
+              pivotal_rb = IO.read(pivotal_rb_path)
+              pivotal_rb.sub!(/^chef_server_root .*/, "chef_server_root \"#{chef_server_root}\"")
+              pivotal_rb.sub!(/^chef_server_url .*/, "chef_server_url \"#{chef_server_url}\"")
+              IO.write("./chef-repo/.chef/pivotal.rb", pivotal_rb)
+            else
+              puts "The pivotal.rb file can not be copied because it does not exist in '#{chef_server.server.name}' Chef Server's `/root/chef-repo/.chef` directory"
+            end
+          end
+        end
+      end
 
-cookbook_path Dir.pwd + "/cookbooks"
-knife[:chef_repo_path] = Dir.pwd
-)
-      IO.write("./chef-repo/.chef/knife.rb", knife_rb)
+      if File.exists?("./chef-repo/.chef/knife.rb")
+        puts "Skipping knife.rb because it already exists in `./chef-repo/.chef`"
+      else
+        knife_rb_path = "#{chef_server.abspath('/root/chef-repo/.chef')}/knife.rb"
+        if File.exists?(knife_rb_path)
+          knife_rb = IO.read(knife_rb_path)
+          knife_rb.sub!(/^chef_server_url .*/, "chef_server_url \"#{chef_server_url}\"")
+          IO.write("./chef-repo/.chef/knife.rb", knife_rb)
+        else
+          puts "The knife.rb file can not be copied because it does not exist in '#{chef_server.server.name}' Chef Server's `/root/chef-repo/.chef` directory"
+        end
+      end
 
       bootstrap_node = %Q(#!/bin/bash
 

data/lib/dev-lxc/server.rb

@@ -362,38 +362,29 @@ module DevLXC
         validator_name = "chef-validator"
 
         FileUtils.cp( Dir.glob("#{@server.config_item('lxc.rootfs')}/etc/chef-server/{admin,chef-validator}.pem"), "#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef" )
-      when 'private-chef'
+      when 'private-chef', 'chef-server-core'
+        chef_server_root = "https://127.0.0.1"
         chef_server_url = "https://127.0.0.1/organizations/ponyville"
         username = "rainbowdash"
         validator_name = "ponyville-validator"
 
-        # give time for all services to come up completely
-        sleep 60
+        FileUtils.cp( "#{@server.config_item('lxc.rootfs')}/etc/opscode/pivotal.pem", "#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef" )
+
         pivotal_rb = %Q(
-chef_server_root "https://127.0.0.1/"
-chef_server_url "https://127.0.0.1/"
+current_dir = File.dirname(__FILE__)
+
+chef_server_root "#{chef_server_root}"
+chef_server_url "#{chef_server_url}"
 
 node_name "pivotal"
-client_key "/etc/opscode/pivotal.pem"
+client_key "\#{current_dir}/pivotal.pem"
 
+cookbook_path Dir.pwd + "/cookbooks"
 knife[:chef_repo_path] = Dir.pwd
 )
         IO.write("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef/pivotal.rb", pivotal_rb)
-        @server.run_command("/opt/opscode/embedded/bin/gem install knife-opc --no-ri --no-rdoc")
-        @server.run_command("/opt/opscode/embedded/bin/knife opc org create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem -c /root/chef-repo/.chef/pivotal.rb")
-        @server.run_command("/opt/opscode/embedded/bin/knife opc user create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem -c /root/chef-repo/.chef/pivotal.rb")
-        @server.run_command("/opt/opscode/embedded/bin/knife opc org user add ponyville rainbowdash --admin -c /root/chef-repo/.chef/pivotal.rb")
-      when 'chef-server-core'
-        chef_server_url = "https://127.0.0.1/organizations/ponyville"
-        username = "rainbowdash"
-        validator_name = "ponyville-validator"
-
-        # give time for all services to come up completely
-        sleep 10
-        run_ctl(@server_ctl, "org-create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem")
-        run_ctl(@server_ctl, "user-create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem")
-        run_ctl(@server_ctl, "org-user-add ponyville rainbowdash --admin")
       end
+
       knife_rb = %Q(
 current_dir = File.dirname(__FILE__)
 
@@ -409,6 +400,22 @@ cookbook_path Dir.pwd + "/cookbooks"
 knife[:chef_repo_path] = Dir.pwd
 )
       IO.write("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef/knife.rb", knife_rb)
+
+      case @chef_server_type
+      when 'private-chef'
+        # give time for all services to come up completely
+        sleep 60
+        @server.run_command("/opt/opscode/embedded/bin/gem install knife-opc --no-ri --no-rdoc")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc org create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc user create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc org user add ponyville rainbowdash --admin -c /root/chef-repo/.chef/pivotal.rb")
+      when 'chef-server-core'
+        # give time for all services to come up completely
+        sleep 10
+        run_ctl(@server_ctl, "org-create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem")
+        run_ctl(@server_ctl, "user-create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem")
+        run_ctl(@server_ctl, "org-user-add ponyville rainbowdash --admin")
+      end
     end
   end
 end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler