knife-rackspace 0.10.0 → 0.10.1.pre.alpha.pre.217

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 5ede86e1bc5bacb0c7290a6dfd95e7cccbb21f97
-  data.tar.gz: bdfcdfbfbca892b07090a26a3cc9f126813bd601
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2Q4MjBjOGFiZWNmMjVkMjM2MzJiMzE2OTFmZWEzYWM3NzMzZDQzZQ==
+  data.tar.gz: !binary |-
+    NzIwOWExNGQzMGZiZTFlMjg3YmFiYTM3NWY0YmU0N2JhYWYxYmU4Yw==
 SHA512:
-  metadata.gz: bef3b8c302354dbaeea7d5df24b9edf743684a733d4658cac11539332b69f3377ca69eb0c8fd5fbc85ea959994a553946a80422329c085eb3bfe4eefeba294a4
-  data.tar.gz: 11909f2b2796829132da6ab7fcd9a4eff906761f758bcd735b479a6faf6031fd7671fc14061ca3a2f8346dfb78d25395a8a8636160427a7b971a30f7444048b0
+  metadata.gz: !binary |-
+    YWZhMjE4ZGYyOTZjZDczMjllMWVlNjhmNzc1YWNlN2ZmN2ExYmNkYmU0YTM2
+    NGE5ZTM0OTA2ZmQ2ZWU2ZmFhZTYwOWU4NzFkNDczNjRjNjNiNjJjNmFiNWVi
+    MTE0MDU5YjBhZDM0YmNiNzBlNzllYWQ3MTYxNTU4MDM5NDY5NzQ=
+  data.tar.gz: !binary |-
+    MDI1MDVhODkzOGZmOWRjNGM0MjU4NDlmZDhkYjI0MjVjMjdhNGEzYmE1ZmE0
+    MDE0NTRiMWVjNGQ5MDMxMzcxYWFkZDRjODUzMGRmZGQ4ZDcxNDY2Y2IzOGVl
+    ODk3YWViODZhYmE5ZjAyNWM3MjVmNjliNzUwMGIwMmQ1ZWMzNWY=

data/.travis.yml

@@ -1,27 +1,46 @@
----
 language: ruby
 rvm:
-- 2.0.0
-- 1.9.3
+  - 2.2
+  - 2.1
+  - 2.0.0
 env:
   global:
-  - secure: ! 'eEsikE/p2yz7/cFvCN/NOoljxBqjzsTWnKC7iZ+fEGGsyhKVJgWn4AasBusZ
-
-      mhtQcOqwakRulzVc+EZN4pqWHgaMC7SnSwhqRU5u1E+BPI4iWNsu+7rjiXhE
-
-      cJK1vE8YodgsgRDQ6evZVQLkwJpRk0qq2tM2LDqpzvy2MeQJIGc='
-  - secure: ! 'V3ohIIF3I8lD05zTUs2nu+CcIzBYcvt1c1euRJ+SPcAH493b4cPquw1NZNFy
-
-      WDIW+1qDQi1DXr8C3Yq8bL4+pY66SukHtxyLhx0V26lGUvI8naq3IqageBQK
-
-      pkb2zZwVYO0a5mLEKOI/7omExBVHDxxX9Bw45vCHLKId3Wt21HE='
-  - secure: ! 'OyKQU1muVBijz2/EkLUgBWbwPKG2UqRhIfpB1ZFkfdQ/06+Vaf82ZEQk3DvY
-
-      2lYFrzvSN1yWrKTMU3XES/dPlVlH87LDOrRhNhgW/NeHhC5BzdwrtvBm08RN
-
-      64ACuFG8fch9zIbx2VTkyLV8xsFXPPSaKMbEXrnikLwqnl5M8PQ='
-  - secure: ! 'DoDVG0HwFg2a7Fj72tlxb8KJto+cBEh7J9YQZ35hK2cmeTsBAcZ4oSOUeAFg
-
-      s2MvBhX0man0zjYPStbL1vcpuS1Ecea3kGzefG0lYhHAzvK7wqqRqhKNFsnd
-
-      FPEVgZrcj3/Lc7mlkbigZouDM7BJLQbMGOv/KOS6f3nYzIhkOfE='
+    - excon_debug: true
+    - secure: |-
+        eEsikE/p2yz7/cFvCN/NOoljxBqjzsTWnKC7iZ+fEGGsyhKVJgWn4AasBusZ
+        mhtQcOqwakRulzVc+EZN4pqWHgaMC7SnSwhqRU5u1E+BPI4iWNsu+7rjiXhE
+        cJK1vE8YodgsgRDQ6evZVQLkwJpRk0qq2tM2LDqpzvy2MeQJIGc=
+    - secure: |-
+        V3ohIIF3I8lD05zTUs2nu+CcIzBYcvt1c1euRJ+SPcAH493b4cPquw1NZNFy
+        WDIW+1qDQi1DXr8C3Yq8bL4+pY66SukHtxyLhx0V26lGUvI8naq3IqageBQK
+        pkb2zZwVYO0a5mLEKOI/7omExBVHDxxX9Bw45vCHLKId3Wt21HE=
+    - secure: |-
+        OyKQU1muVBijz2/EkLUgBWbwPKG2UqRhIfpB1ZFkfdQ/06+Vaf82ZEQk3DvY
+        2lYFrzvSN1yWrKTMU3XES/dPlVlH87LDOrRhNhgW/NeHhC5BzdwrtvBm08RN
+        64ACuFG8fch9zIbx2VTkyLV8xsFXPPSaKMbEXrnikLwqnl5M8PQ=
+    - secure: |-
+        DoDVG0HwFg2a7Fj72tlxb8KJto+cBEh7J9YQZ35hK2cmeTsBAcZ4oSOUeAFg
+        s2MvBhX0man0zjYPStbL1vcpuS1Ecea3kGzefG0lYhHAzvK7wqqRqhKNFsnd
+        FPEVgZrcj3/Lc7mlkbigZouDM7BJLQbMGOv/KOS6f3nYzIhkOfE=
+    - secure: |-
+        SB4aoB5BCqqSFMpxJvN031tikc7VzXGX6PaOIngu5h3M9k3Qmkuvel8oQISb
+        fhcbsmuA0EKlaCvjQsgXFoUvUE6UnPCc7h2816fEAEz7FrRF1Q1mnbZ2V/kG
+        PtPYcPl4ZH4VxwAD+6kTtbl1aCTP8nKXTFXlKlrPAawpS7ef0B8=
+    - secure: |-
+        J01xNjFaqlwzin59fpvgKkp49p5VI128cFvM3pxvlErPLnjWE9kJ4NKzzznv
+        tVc12zVat/twxepvjSzg88b0q4Ks6P0Ovy0LeQCFUkva/jiBQuGukByR3joU
+        xuAFiCssBoaZEEKlN69n/zhihFxG/0z8Tn4h9pgAkSAyAq8UZJ0=
+    - secure: |-
+        W7NIurlDI/LtO27N5Yv9i2i/TLvwSL6L5bF0yJMtPNsL21xbcqBkcFY+0PEU
+        2jIzA6Ib861UACb9Xh45tXmY/zuUHQ/otuIdAwocawulxBjrTuNUDo58ZVEv
+        GzvTdFIaOWczTTvBcaNy9msenXiRBQTWriMFR0uPKIH/mYGF3Ew=
+    - secure: |-
+        RQDTTLjob/9p+9XpcpYo4VaQSVvVbbHtUcpVyTXcnHwMq3WJzXXBoj/9iFxA
+        Uupx9IhP0gZhX6kzcm5BG+oKTYAxTQkf2tRCRkVMBFCJKreER1SuSDVvljdV
+        KLMfTbC5qwXox78PtD23BjO5k8hCJCSHfs0XuQ5y7k1mMFjM4ok=
+deploy:
+  provider: rubygems
+  api_key:
+    secure: YeHeF7cuLuN3lHJQNQ4jpgfhaHGuB861cF6dzoyGPzAi/PO3wmTZfDNG27iI3zCe3CPviDSPiK4v14SQA1Xq3UtvSmeE+zcX/PxYsjNp7EQPn8J6fq2DfjmhYU5ECXnojbTkoh2HIM29YXBjxS8VlSTFDHYx0oV6uMZFgrzSLrI=
+  on:
+    tags: true

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.10.1
+* Support new chef-vault bootrap flags (--bootstrap-vault-file, -bootstrap-vault-json, and --bootstrap-vault-item)
+
 ## v0.10.0
 * KNIFE-498 knife rackspace uses direct TCP connection on port 22 to verify SSHD
 * Update Windows bootstrapping instructions in the README

data/Gemfile

@@ -1,8 +1,3 @@
 source "http://rubygems.org"
 
-group :development, :test do
-  gem "knife-dsl", :git => 'git://github.com/maxlinc/knife-dsl.git', :branch => 'io_capture_fix'
-end
-
-# Specify your gem's dependencies in knife-rackspace.gemspec
 gemspec

data/README.rdoc

@@ -1,5 +1,7 @@
 = Knife Rackspace
 
+{<img src="https://travis-ci.org/chef/knife-rackspace.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/chef/knife-rackspace]
+
 = DESCRIPTION:
 
 This is the official Opscode Knife plugin for Rackspace Cloud Servers. This plugin gives knife the ability to create, bootstrap, and manage servers on all the regions for Rackspace Cloud Servers.
@@ -136,12 +138,78 @@ Creates a new cloud network. Both the label and the CIDR are required parameters
 
 Deletes one or more specified networks by id. The network must be detached from all hosts before it is deleted.
 
+
+== Knife & Rackspace Rackconnect
+
+Rackspace Rackconnect allows the creation of a hybrid setup where you can have Cloud servers which are connected to bare metal hardware like Firewalls and Load balancers. You can read more about this product at http://www.rackspace.com/cloud/hybrid/rackconnect/
+
+Under the hood, this changes the behaviour of how the cloud servers are configured and how IP addresses are assigned to them. So when using knife-rackspace with a 'Rack connected' cloud account you need use some additional parameters. See the sections below for more information regarding the two versions of Rack Connect.
+
+Note: If you account is leveraging private cloud networks for Rackconnnect then you are using Rackconnect v3. You can also find your version of Rackconnect by checking with your support team
+
+
+=== Knife and Rackconnect version 2
+
+    knife rackspace server create  \
+    --server-name <name of the server> \
+    --image <Rackspace image id> \
+    --flavor <Rackspace flavor id> \
+    -r 'role[base]' \
+    --rackconnect-wait
+
+Note: If the server is also part of Rackspace Managed Operations service level you will need to add the <tt>--rackspace-servicelevel-wait</tt> option.
+
+    knife rackspace server create  \
+    --server-name <name of the server> \
+    --image <Rackspace image id> \
+    --flavor <Rackspace flavor id> \
+    -r 'role[base]' \
+    --rackconnect-wait \
+    --rackspace-servicelevel-wait
+
+<tt>--rackconnect-wait</tt> does the following :-
+
+* Rackconnect version 2 changes the networking on the cloud server and forces all trafic to route via the dedicated firewall or load balancer. It also then assigns the cloud server a new public IP address. The status of this automation provided by updates to the cloud server metadata. This option makes Knife wait for the Rackconnect automation to complete by checking the metadata.
+ 
+* Once the status is updated, it triggers the bootstrap process.
+
+
+<tt>--rackspace-servicelevel-wait</tt> does the following :-
+
+* For Cloud servers in the Managed operations service level, Rackspace installs additional agents and software which enables them to provide support. This automation. like the Rackconnect one, updates the cloud server metadata of its status. Likewise, using this option, makes knife wait till the automation is complete before triggering the bootstrap process. 
+
+
+
+=== Knife and Rackconnect version 3
+
+In case of version 3, there is a different command line option. 
+
+    knife rackspace server create \
+    --server-name <name of the server> \
+    --image <Rackspace image id> \
+    --flavor <Rackspace flavor id> \
+    -r 'role[base]' \
+    --rackconnect-v3-network-id <cloud network id>
+
+
+<tt>--rackconnect-v3-network-id</tt> does the following :-
+* Create the server with the corresponding cloud network. The network id the id of an existing cloud network.
+* Knife will then issue addtional API calls to the Rackconnect API to assign a new public IP to the cloud server. The new IP is also stored in the Cloud Server Metadata under accessv4IP. 
+* Knife then waits for the IP to be provisioned before triggering the bootstrap process.
+
+Functionally, this operates the same way as version 2. However, behind the scenes, Rackconnect v3 is signifcantly different in implementation. You can learn about the differences here :
+http://www.rackspace.com/knowledge_center/article/comparing-rackconnect-v30-and-rackconnect-v20
+
+
 = LICENSE:
 
-Author:: Adam Jacob (<adam@opscode.com>)
-Author:: Seth Chisamore (<schisamo@opscode.com>)
-Author:: Matt Ray (<matt@opscode.com>)
+Author:: Adam Jacob (<adam@chef.io>)
+Author:: Seth Chisamore (<schisamo@chef.io>)
+Author:: Matt Ray (<matt@chef.io>)
+Author:: JJ Asghar (<jj@chef.io>)
+Author:: Rackspace Developers
 Copyright:: Copyright (c) 2009-2012 Opscode, Inc.
+Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
 License:: Apache License, Version 2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/knife-rackspace.gemspec

@@ -5,10 +5,11 @@ require "knife-rackspace/version"
 Gem::Specification.new do |s|
   s.name        = "knife-rackspace"
   s.version     = Knife::Rackspace::VERSION
+  s.version = "#{s.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
   s.has_rdoc = true
-  s.authors     = ["Adam Jacob","Seth Chisamore", "Matt Ray"]
-  s.email       = ["adam@opscode.com","schisamo@opscode.com", "matt@opscode.com"]
-  s.homepage = "http://wiki.opscode.com/display/chef"
+  s.authors     = ["Adam Jacob","Seth Chisamore", "Matt Ray","Rackspace Developers","JJ Asghar"]
+  s.email       = ["adam@chef.io","schisamo@chef.io", "matt@chef.io","jj@chef.io"]
+  s.homepage = "https://docs.chef.io/plugin_knife_rackspace.html"
   s.summary = "Rackspace Support for Chef's Knife Command"
   s.description = s.summary
   s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
@@ -21,8 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
 
-  # In Gemfile because I'm using a fork on Github.  Hopefully pull request will be merged and a new gem will be released soon.
-  # s.add_development_dependency "knife-dsl"
+  s.add_development_dependency "knife-dsl"
   s.add_development_dependency "rspec"
   s.add_development_dependency "vcr"
   s.add_development_dependency "ansi"

data/lib/chef/knife/rackspace_base.rb

@@ -192,7 +192,7 @@ class Chef
       end
 
       def v1_public_ip(server)
-          server.public_ip_address == nil ? "" : server.public_ip_address
+        server.public_ip_address == nil ? "" : server.public_ip_address
       end
 
       def v1_private_ip(server)

data/lib/chef/knife/rackspace_network_create.rb

@@ -7,7 +7,7 @@ class Chef
       include Knife::RackspaceBase
 
       banner "knife rackspace network create (options)"
-      
+
       option :label,
         :short => "-L LABEL",
         :long => "--label LABEL",
@@ -19,7 +19,7 @@ class Chef
         :long => "--cidr CIDR",
         :description => "CIDR for the network",
         :required => true
-      
+
       def run
         if version_one?
           ui.error "Networks are not supported in v1"

data/lib/chef/knife/rackspace_network_delete.rb

@@ -7,7 +7,7 @@ class Chef
       include Knife::RackspaceBase
 
       banner "knife rackspace network delete NETWORK_ID [NETWORK_ID] (options)"
-      
+
       def run
         if version_one?
           ui.error "Networks are not supported in v1"
@@ -22,7 +22,7 @@ class Chef
             msg_pair("Network ID", network.id)
             msg_pair("Label", network.label)
             msg_pair("CIDR", network.cidr)
-            
+
             puts "\n"
             confirm("Do you really want to delete this network")
 

data/lib/chef/knife/rackspace_server_create.rb

@@ -107,7 +107,7 @@ class Chef
         :description => "The version of Chef to install",
         :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
 
-        option :distro,
+      option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
         :description => "Bootstrap a distro using a template; default is 'chef-full'",
@@ -146,6 +146,12 @@ class Chef
         :boolean => true,
         :default => false
 
+      option :rackconnect_v3_network_id,
+        :long => '--rackconnect-v3-network-id ID',
+        :description => 'Rackconnect V3 ONLY: Link a new server to an existing network',
+        :proc => lambda { |o| Chef::Config[:knife][:rackconnect_v3_network_id] = o },
+        :default => nil
+
       option :rackspace_servicelevel_wait,
         :long => "--rackspace-servicelevel-wait",
         :description => "Wait until the Rackspace service level automation setup is complete before bootstrapping chef",
@@ -156,9 +162,9 @@ class Chef
         :long => "--hint HINT_NAME[=HINT_FILE]",
         :description => "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
         :proc => Proc.new { |h|
-           Chef::Config[:knife][:hints] ||= {}
-           name, path = h.split("=")
-           Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new
+          Chef::Config[:knife][:hints] ||= {}
+          name, path = h.split("=")
+          Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new
         }
 
       option :host_key_verify,
@@ -178,6 +184,16 @@ class Chef
         :description => "The ssh wait timeout, before attempting ssh",
         :default => "0"
 
+      option :retry_ssh_every,
+        :long => "--retry-ssh-every TIMEOUT",
+        :description => "Retry SSH after n seconds (retry each period)",
+        :default => "5"
+
+      option :retry_ssh_limit,
+        :long => "--retry-ssh-limit COUNT",
+        :description => "Retry SSH at most this number of times",
+        :default => "5"
+
       option :default_networks,
         :long => "--[no-]default-networks",
         :description => "Include public and service networks, enabled by default",
@@ -236,6 +252,25 @@ class Chef
         :description => "A file containing the secret key to use to encrypt data bag item values",
         :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
+      option :bootstrap_vault_file,
+        :long        => '--bootstrap-vault-file VAULT_FILE',
+        :description => 'A JSON file with a list of vault(s) and item(s) to be updated'
+
+      option :bootstrap_vault_json,
+        :long        => '--bootstrap-vault-json VAULT_JSON',
+        :description => 'A JSON string with the vault(s) and item(s) to be updated'
+
+      option :bootstrap_vault_item,
+        :long        => '--bootstrap-vault-item VAULT_ITEM',
+        :description => 'A single vault and item to update as "vault:item"',
+        :proc        => Proc.new { |i|
+          (vault, item) = i.split(/:/)
+          Chef::Config[:knife][:bootstrap_vault_item] ||= {}
+          Chef::Config[:knife][:bootstrap_vault_item][vault] ||= []
+          Chef::Config[:knife][:bootstrap_vault_item][vault].push(item)
+          Chef::Config[:knife][:bootstrap_vault_item]
+        }
+
       def load_winrm_deps
         require 'winrm'
         require 'em-winrm'
@@ -244,37 +279,31 @@ class Chef
         require 'chef/knife/winrm'
       end
 
-      def tcp_test_ssh(hostname)
-        sleep config[:ssh_wait_timeout].to_i
+      def tcp_test_ssh(server, bootstrap_ip)
+        return true unless config[:tcp_test_ssh] != nil
 
-        # if this feature is disabled, just return true to skip it
-        return true if not config[:tcp_test_ssh]
+        limit = Chef::Config[:knife][:retry_ssh_limit].to_i
+        count = 0
 
-        ssh_port = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
-        tcp_socket = TCPSocket.new(hostname, ssh_port)
-        readable = IO.select([tcp_socket], nil, nil, 5)
-        if readable
-          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
-          yield
-          true
-        else
-          false
+        begin
+          Net::SSH.start(bootstrap_ip, 'root', :password => server.password ) do |ssh|
+            Chef::Log.debug("sshd accepting connections on #{bootstrap_ip}")
+            break
+          end
+        rescue
+          count += 1
+
+          if count <= limit
+            print '.'
+            sleep config[:retry_ssh_every].to_i
+            tcp_test_ssh(server, bootstrap_ip)
+          else
+            ui.error "Unable to SSH into #{bootstrap_ip}"
+            exit 1
+          end
         end
-      rescue Errno::ETIMEDOUT
-        false
-      rescue Errno::EPERM
-        false
-      rescue Errno::ECONNREFUSED
-        sleep 2
-        false
-      rescue Errno::EHOSTUNREACH
-        sleep 2
-        false
-      ensure
-        tcp_socket && tcp_socket.close
       end
 
-
       def parse_file_argument(arg)
         dest, src = arg.split('=')
         unless dest && src
@@ -306,9 +335,9 @@ class Chef
             :path => dest,
             :contents => encode_file(src)
           }
+        end
+        files
       end
-      files
-    end
 
 
 
@@ -333,7 +362,6 @@ class Chef
         false
       end
 
-
       def run
         $stdout.sync = true
 
@@ -349,22 +377,22 @@ class Chef
           load_winrm_deps
         end
 
-        node_name = get_node_name(config[:chef_node_name] || config[:server_name])
-        networks = get_networks(Chef::Config[:knife][:rackspace_networks])
-
-        rackconnect_wait = Chef::Config[:knife][:rackconnect_wait] || config[:rackconnect_wait]
+        rackconnect_wait            = Chef::Config[:knife][:rackconnect_wait] || config[:rackconnect_wait]
+        rackconnect3                = Chef::Config[:knife][:rackconnect_v3_network_id] || config[:rackconnect_v3_network_id]
         rackspace_servicelevel_wait = Chef::Config[:knife][:rackspace_servicelevel_wait] || config[:rackspace_servicelevel_wait]
+        node_name                   = get_node_name(config[:chef_node_name] || config[:server_name])
+        networks                    = get_networks(Chef::Config[:knife][:rackspace_networks], rackconnect3)
 
         server = connection.servers.new(
-          :name => node_name,
-          :image_id => Chef::Config[:knife][:image],
-          :flavor_id => locate_config_value(:flavor),
-          :metadata => Chef::Config[:knife][:rackspace_metadata],
-          :disk_config => Chef::Config[:knife][:rackspace_disk_config],
-          :user_data => user_data,
+          :name         => node_name,
+          :image_id     => Chef::Config[:knife][:image],
+          :flavor_id    => locate_config_value(:flavor),
+          :metadata     => Chef::Config[:knife][:rackspace_metadata],
+          :disk_config  => Chef::Config[:knife][:rackspace_disk_config],
+          :user_data    => user_data,
           :config_drive => locate_config_value(:rackspace_config_drive) || false,
-          :personality => files,
-          :key_name => Chef::Config[:knife][:rackspace_ssh_keypair]
+          :personality  => files,
+          :key_name     => Chef::Config[:knife][:rackspace_ssh_keypair]
         )
 
         if version_one?
@@ -382,14 +410,16 @@ class Chef
         msg_pair("ConfigDrive", server.config_drive)
         msg_pair("UserData", Chef::Config[:knife][:rackspace_user_data])
         msg_pair("RackConnect Wait", rackconnect_wait ? 'yes' : 'no')
+        msg_pair("RackConnect V3", rackconnect3 ? 'yes' : 'no')
         msg_pair("ServiceLevel Wait", rackspace_servicelevel_wait ? 'yes' : 'no')
         msg_pair("SSH Key", Chef::Config[:knife][:rackspace_ssh_keypair])
 
         # wait for it to be ready to do stuff
         begin
-          server.wait_for(Integer(locate_config_value(:server_create_timeout))) { 
-            print "."; 
+          server.wait_for(Integer(locate_config_value(:server_create_timeout))) {
+            print ".";
             Chef::Log.debug("#{progress}%")
+
             if rackconnect_wait and rackspace_servicelevel_wait
               Chef::Log.debug("rackconnect_automation_status: #{metadata.all['rackconnect_automation_status']}")
               Chef::Log.debug("rax_service_level_automation: #{metadata.all['rax_service_level_automation']}")
@@ -411,15 +441,26 @@ class Chef
           msg_pair('rax_service_level_automation', server.metadata.all['rax_service_level_automation'])
           Chef::Application.fatal! 'Server didn\'t finish on time'
         end
+
         msg_pair("Metadata", server.metadata)
-        if(networks && Chef::Config[:knife][:rackspace_networks])
-          msg_pair("Networks", Chef::Config[:knife][:rackspace_networks].sort.join(', '))
-        end
 
         print "\n#{ui.color("Waiting server", :magenta)}"
 
         puts("\n")
 
+        if Chef::Config[:knife][:rackconnect_v3_network_id]
+          print "\n#{ui.color("Setting up RackconnectV3 network and IPs", :magenta)}"
+          setup_rackconnect_network!(server)
+          while server.ipv4_address == ""
+            server.reload
+            sleep 5
+          end
+        end
+
+        if networks && Chef::Config[:knife][:rackspace_networks]
+          msg_pair("Networks", Chef::Config[:knife][:rackspace_networks].sort.join(', '))
+        end
+
         msg_pair("Public DNS Name", public_dns_name(server))
         msg_pair("Public IP Address", ip_address(server, 'public'))
         msg_pair("Private IP Address", ip_address(server, 'private'))
@@ -427,31 +468,30 @@ class Chef
         msg_pair("Metadata", server.metadata.all)
 
         bootstrap_ip_address = ip_address(server, config[:bootstrap_network])
+
         Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip_address}")
         if bootstrap_ip_address.nil?
           ui.error("No IP address available for bootstrapping.")
           exit 1
         end
 
-      if locate_config_value(:bootstrap_protocol) == 'winrm'
-        print "\n#{ui.color("Waiting for winrm", :magenta)}"
-        print(".") until tcp_test_winrm(bootstrap_ip_address, locate_config_value(:winrm_port))
-        bootstrap_for_windows_node(server, bootstrap_ip_address).run
-      else
-        print "\n#{ui.color("Waiting for sshd", :magenta)}"
-        print(".") until tcp_test_ssh(bootstrap_ip_address) {
-          sleep @initial_sleep_delay ||= 10
-          puts("done")
-        }
-        bootstrap_for_node(server, bootstrap_ip_address).run
-      end
+        if locate_config_value(:bootstrap_protocol) == 'winrm'
+          print "\n#{ui.color("Waiting for winrm", :magenta)}"
+          print(".") until tcp_test_winrm(bootstrap_ip_address, locate_config_value(:winrm_port))
+          bootstrap_for_windows_node(server, bootstrap_ip_address).run
+        else
+          print "\n#{ui.color("Waiting for sshd", :magenta)}"
+          tcp_test_ssh(server, bootstrap_ip_address)
+          bootstrap_for_node(server, bootstrap_ip_address).run
+        end
 
         puts "\n"
         msg_pair("Instance ID", server.id)
         msg_pair("Host ID", server.host_id)
         msg_pair("Name", server.name)
         msg_pair("Flavor", server.flavor.name)
-        msg_pair("Image", server.image.name)
+        msg_pair("Image", server.image.name) if server.image
+        msg_pair("Boot Image ID", server.boot_image_id) if server.boot_image_id
         msg_pair("Metadata", server.metadata)
         msg_pair("Public DNS Name", public_dns_name(server))
         msg_pair("Public IP Address", ip_address(server, 'public'))
@@ -460,11 +500,31 @@ class Chef
         msg_pair("Environment", config[:environment] || '_default')
         msg_pair("Run List", config[:run_list].join(', '))
       end
-      
+
+      def setup_rackconnect_network!(server)
+        auth_token = connection.authenticate
+        tenant_id  = connection.endpoint_uri.path.split("/").last
+        region     = connection.region
+        uri        = URI("https://#{region}.rackconnect.api.rackspacecloud.com/v3/#{tenant_id}/public_ips")
+
+        Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+          begin
+            req                 = Net::HTTP::Post.new(uri.request_uri)
+            req['X-Auth-Token'] = auth_token
+            req['Content-Type'] = 'application/json'
+            req.body            = JSON.dump("cloud_server" => { "id" => server.id })
+            http.use_ssl        = true
+            http.request req
+          rescue StandardError => e
+            puts "HTTP Request failed (#{e.message})"
+          end
+        end
+      end
+
       def user_data
         file = Chef::Config[:knife][:rackspace_user_data]
         return unless file
-        
+
         begin
           filename = File.expand_path(file)
           content = File.read(filename)
@@ -480,9 +540,12 @@ class Chef
         bootstrap.name_args = [bootstrap_ip_address]
         bootstrap.config[:ssh_user] = config[:ssh_user] || "root"
         bootstrap.config[:ssh_password] = server.password
-        bootstrap.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
+        bootstrap.config[:ssh_port] = config[:ssh_port] || Chef::Config[:knife][:ssh_port]
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:host_key_verify] = config[:host_key_verify]
+        bootstrap.config[:bootstrap_vault_file] = config[:bootstrap_vault_file] if config[:bootstrap_vault_file]
+        bootstrap.config[:bootstrap_vault_json] = config[:bootstrap_vault_json] if config[:bootstrap_vault_json]
+        bootstrap.config[:bootstrap_vault_item] = config[:bootstrap_vault_item] if config[:bootstrap_vault_item]
         # bootstrap will run as root...sudo (by default) also messes up Ohai on CentOS boxes
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         bootstrap.config[:distro] = locate_config_value(:distro)  || 'chef-full'
@@ -531,17 +594,21 @@ class Chef
       chef_node_name = "rs-"+rand.to_s.split('.')[1] unless version_one?
     end
 
-    def get_networks(names)
+    def get_networks(names, rackconnect3=false)
       names = Array(names)
+
       if(Chef::Config[:knife][:rackspace_version] == 'v2')
-        if(config[:default_networks])
+        if rackconnect3
+          nets = [Chef::Config[:knife][:rackconnect_v3_network_id]]
+        elsif config[:default_networks]
           nets = [
             '00000000-0000-0000-0000-000000000000',
             '11111111-1111-1111-1111-111111111111'
           ]
         else
-          nets = []
+          nets  = []
         end
+
         available_networks = connection.networks.all
 
         names.each do |name|

data/lib/chef/knife/rackspace_server_delete.rb

@@ -66,7 +66,7 @@ class Chef
             msg_pair("Host ID", server.host_id)
             msg_pair("Name", server.name)
             msg_pair("Flavor", server.flavor.name)
-            msg_pair("Image", server.image.name)
+            msg_pair("Image", server.image.name) if server.image
             msg_pair("Public IP Address", ip_address(server, 'public'))
             msg_pair("Private IP Address", ip_address(server, 'private'))
 

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/integration/integration_spec.rb

@@ -1,100 +1,100 @@
-require 'integration_spec_helper'
-require 'fog'
-require 'knife/dsl'
-require 'chef/knife/rackspace_server_create'
-# include Chef::Knife::DSL
-
-[:v1, :v2].each do |api|
-  describe api do
-    before(:each) do
-      Chef::Config[:knife][:rackspace_version] = api.to_s #v2 by default
-      Chef::Config[:knife][:rackspace_region] = :iad
-
-      Chef::Knife::Bootstrap.any_instance.stub(:run)
-      Chef::Knife::RackspaceServerCreate.any_instance.stub(:tcp_test_ssh).with(anything).and_return(true)
-    end
-
-    it 'should list server flavors', :vcr do
-      stdout, stderr, status = knife_capture('rackspace flavor list')
-      status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
-
-      expected_output = {
-        :v1 => """
-ID  Name           Architecture  RAM    Disk
-1   256 server     64-bit        256    10 GB
-2   512 server     64-bit        512    20 GB
-3   1GB server     64-bit        1024   40 GB
-4   2GB server     64-bit        2048   80 GB
-5   4GB server     64-bit        4096   160 GB
-6   8GB server     64-bit        8192   320 GB
-7   15.5GB server  64-bit        15872  620 GB
-8   30GB server    64-bit        30720  1200 GB
-""",
-        :v2 => """
-ID                Name                     VCPUs  RAM     Disk
-2                 512MB Standard Instance  1      512     20 GB
-3                 1GB Standard Instance    1      1024    40 GB
-4                 2GB Standard Instance    2      2048    80 GB
-5                 4GB Standard Instance    2      4096    160 GB
-6                 8GB Standard Instance    4      8192    320 GB
-7                 15GB Standard Instance   6      15360   620 GB
-8                 30GB Standard Instance   8      30720   1200 GB
-performance1-1    1 GB Performance         1      1024    20 GB
-performance1-2    2 GB Performance         2      2048    40 GB
-performance1-4    4 GB Performance         4      4096    40 GB
-performance1-8    8 GB Performance         8      8192    40 GB
-performance2-120  120 GB Performance       32     122880  40 GB
-performance2-15   15 GB Performance        4      15360   40 GB
-performance2-30   30 GB Performance        8      30720   40 GB
-performance2-60   60 GB Performance        16     61440   40 GB
-performance2-90   90 GB Performance        24     92160   40 GB
-"""} 
-      stdout = ANSI.unansi stdout
-      stdout.should match_output(expected_output[api])
-    end
-
-    it 'should list images', :vcr do
-      sample_image = {
-        :v1 => 'Ubuntu 12.04 LTS',
-        :v2 => 'Ubuntu 12.04 LTS (Precise Pangolin)'
-      }
-
-      stdout, stderr, status = knife_capture('rackspace image list')
-      status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
-      stdout = clean_output(stdout)
-      stdout.should match /^ID\s*Name\s*$/
-      stdout.should include sample_image[api]
-    end
-
-    it 'should manage servers', :vcr do
-      pending "The test works, but I'm in the process of cleaning up sensitive data in the cassettes"
-
-      image = {
-        :v1 => '112',
-        :v2 => 'e4dbdba7-b2a4-4ee5-8e8f-4595b6d694ce'
-      }
-      flavor = 2
-      server_list.should_not include 'test-node'
-
-      args = %W{rackspace server create -I #{image[api]} -f #{flavor} -N test-node -S test-server}
-      stdout, stderr, status = knife_capture(args)
-      status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
-      instance_data = capture_instance_data(stdout, {
-        :name => 'Name',
-        :instance_id => 'Instance ID',
-        :public_ip => 'Public IP Address',
-        :private_ip => 'Private IP Address'
-      })
-
-      # Wanted to assert active state, but got build during test
-      server_list.should match /#{instance_data[:instance_id]}\s*#{instance_data[:name]}\s*#{instance_data[:public_ip]}\s*#{instance_data[:private_ip]}\s*#{flavor}\s*#{image}/
-
-      args = %W{rackspace server delete #{instance_data[:instance_id]} -y}
-      stdout, stderr, status = knife_capture(args)
-      status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
-
-      # Need to deal with deleting vs deleted states before we can check this
-      # server_list.should_not match /#{instance_data[:instance_id]}\s*#{instance_data[:name]}\s*#{instance_data[:public_ip]}\s*#{instance_data[:private_ip]}\s*#{flavor}\s*#{image}/
-    end
-  end
-end
+# require 'integration_spec_helper'
+# require 'fog'
+# require 'knife/dsl'
+# require 'chef/knife/rackspace_server_create'
+# # include Chef::Knife::DSL
+#
+# [:v1, :v2].each do |api|
+#   describe api do
+#     before(:each) do
+#       Chef::Config[:knife][:rackspace_version] = api.to_s #v2 by default
+#       Chef::Config[:knife][:rackspace_region] = :iad
+#
+#       Chef::Knife::Bootstrap.any_instance.stub(:run)
+#       Chef::Knife::RackspaceServerCreate.any_instance.stub(:tcp_test_ssh).with(anything).and_return(true)
+#     end
+#
+#     it 'should list server flavors', :vcr do
+#       stdout, stderr, status = knife_capture('rackspace flavor list')
+#       status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
+#
+#       expected_output = {
+#         :v1 => """
+# ID  Name           Architecture  RAM    Disk
+# 1   256 server     64-bit        256    10 GB
+# 2   512 server     64-bit        512    20 GB
+# 3   1GB server     64-bit        1024   40 GB
+# 4   2GB server     64-bit        2048   80 GB
+# 5   4GB server     64-bit        4096   160 GB
+# 6   8GB server     64-bit        8192   320 GB
+# 7   15.5GB server  64-bit        15872  620 GB
+# 8   30GB server    64-bit        30720  1200 GB
+# """,
+#         :v2 => """
+# ID                Name                     VCPUs  RAM     Disk
+# 2                 512MB Standard Instance  1      512     20 GB
+# 3                 1GB Standard Instance    1      1024    40 GB
+# 4                 2GB Standard Instance    2      2048    80 GB
+# 5                 4GB Standard Instance    2      4096    160 GB
+# 6                 8GB Standard Instance    4      8192    320 GB
+# 7                 15GB Standard Instance   6      15360   620 GB
+# 8                 30GB Standard Instance   8      30720   1200 GB
+# performance1-1    1 GB Performance         1      1024    20 GB
+# performance1-2    2 GB Performance         2      2048    40 GB
+# performance1-4    4 GB Performance         4      4096    40 GB
+# performance1-8    8 GB Performance         8      8192    40 GB
+# performance2-120  120 GB Performance       32     122880  40 GB
+# performance2-15   15 GB Performance        4      15360   40 GB
+# performance2-30   30 GB Performance        8      30720   40 GB
+# performance2-60   60 GB Performance        16     61440   40 GB
+# performance2-90   90 GB Performance        24     92160   40 GB
+# """}
+#       stdout = ANSI.unansi stdout
+#       stdout.should match_output(expected_output[api])
+#     end
+#
+#     it 'should list images', :vcr do
+#       sample_image = {
+#         :v1 => 'Ubuntu 12.04 LTS',
+#         :v2 => 'Ubuntu 12.04 LTS (Precise Pangolin)'
+#       }
+#
+#       stdout, stderr, status = knife_capture('rackspace image list')
+#       status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
+#       stdout = clean_output(stdout)
+#       stdout.should match /^ID\s*Name\s*$/
+#       stdout.should include sample_image[api]
+#     end
+#
+#     it 'should manage servers', :vcr do
+#       pending "The test works, but I'm in the process of cleaning up sensitive data in the cassettes"
+#
+#       image = {
+#         :v1 => '112',
+#         :v2 => 'e4dbdba7-b2a4-4ee5-8e8f-4595b6d694ce'
+#       }
+#       flavor = 2
+#       server_list.should_not include 'test-node'
+#
+#       args = %W{rackspace server create -I #{image[api]} -f #{flavor} -N test-node -S test-server}
+#       stdout, stderr, status = knife_capture(args)
+#       status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
+#       instance_data = capture_instance_data(stdout, {
+#         :name => 'Name',
+#         :instance_id => 'Instance ID',
+#         :public_ip => 'Public IP Address',
+#         :private_ip => 'Private IP Address'
+#       })
+#
+#       # Wanted to assert active state, but got build during test
+#       server_list.should match /#{instance_data[:instance_id]}\s*#{instance_data[:name]}\s*#{instance_data[:public_ip]}\s*#{instance_data[:private_ip]}\s*#{flavor}\s*#{image}/
+#
+#       args = %W{rackspace server delete #{instance_data[:instance_id]} -y}
+#       stdout, stderr, status = knife_capture(args)
+#       status.should be(0), "Non-zero exit code.\n#{stdout}\n#{stderr}"
+#
+#       # Need to deal with deleting vs deleted states before we can check this
+#       # server_list.should_not match /#{instance_data[:instance_id]}\s*#{instance_data[:name]}\s*#{instance_data[:public_ip]}\s*#{instance_data[:private_ip]}\s*#{flavor}\s*#{image}/
+#     end
+#   end
+# end

metadata

@@ -1,129 +1,146 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1.pre.alpha.pre.217
 platform: ruby
 authors:
 - Adam Jacob
 - Seth Chisamore
 - Matt Ray
+- Rackspace Developers
+- JJ Asghar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.22'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
+- !ruby/object:Gem::Dependency
+  name: knife-dsl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rackspace Support for Chef's Knife Command
 email:
-- adam@opscode.com
-- schisamo@opscode.com
-- matt@opscode.com
+- adam@chef.io
+- schisamo@chef.io
+- matt@chef.io
+- jj@chef.io
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files:
-- ".chef/knife.rb"
-- ".gitignore"
-- ".travis.yml"
+- .chef/knife.rb
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -148,7 +165,7 @@ files:
 - spec/integration_spec_helper.rb
 - spec/spec_helper.rb
 - spec/unit/rackspace_base_spec.rb
-homepage: http://wiki.opscode.com/display/chef
+homepage: https://docs.chef.io/plugin_knife_rackspace.html
 licenses: []
 metadata: {}
 post_install_message: 
@@ -157,26 +174,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rackspace Support for Chef's Knife Command
-test_files:
-- spec/cassettes/v1/should_list_images.yml
-- spec/cassettes/v1/should_list_server_flavors.yml
-- spec/cassettes/v2/should_list_images.yml
-- spec/cassettes/v2/should_list_server_flavors.yml
-- spec/integration/integration_spec.rb
-- spec/integration_spec_helper.rb
-- spec/spec_helper.rb
-- spec/unit/rackspace_base_spec.rb
+test_files: []