README.md in knife-openstack-0.10.0 vs README.md in knife-openstack-1.0.0.rc1

- old
+ new

@@ -1,5 +1,7 @@ +[![Build Status](https://travis-ci.org/opscode/knife-openstack.png)](https://travis-ci.org/opscode/knife-openstack) + Knife OpenStack =============== This is the official Chef Knife plugin for OpenStack Compute (Nova). This plugin gives knife the ability to create, bootstrap and manage instances in OpenStack Compute clouds. It has been tested against the `Diablo` through `Icehouse` releases in configurations using Keystone against the OpenStack API (as opposed to the EC2 API). @@ -25,13 +27,13 @@ knife[:openstack_auth_url] = "http://cloud.mycompany.com:5000/v2.0/tokens" knife[:openstack_username] = "Your OpenStack Dashboard username" knife[:openstack_password] = "Your OpenStack Dashboard password" knife[:openstack_tenant] = "Your OpenStack tenant name" -If your knife.rb file will be checked into a SCM system (ie readable by others) you may want to read the values from environment variables: +If your knife.rb file will be checked into a SCM system (ie readable by others) you may want to read the values from environment variables. For example, using the conventions of [OpenStack's RC file](http://docs.openstack.org/user-guide/content/cli_openrc.html) (note the `openstack_auth_url`): - knife[:openstack_auth_url] = "#{ENV['OS_AUTH_URL']}" + knife[:openstack_auth_url] = "#{ENV['OS_AUTH_URL']}/tokens" knife[:openstack_username] = "#{ENV['OS_USERNAME']}" knife[:openstack_password] = "#{ENV['OS_PASSWORD']}" knife[:openstack_tenant] = "#{ENV['OS_TENANT_NAME']}" If your OpenStack deployment is over SSL, but does not have a valid certificate, you can add the following option to bypass SSL check: @@ -54,11 +56,11 @@ * openstack_ssh_key_id * template_file # Working with Floating IPs # -To use a floating IP address while bootstrapping nodes, use the `-a` or `--floating-ip` option. +To use a floating IP address while bootstrapping nodes, use the `-a` or `--openstack-floating-ip` option. # Working with Windows Images # Provisioning and bootstrapping for Windows 2003 and later images is now supported. The Windows images need to have WinRM enabled with Basic Authentication configured. Current support does not support Kerberos Authentication. @@ -106,10 +108,10 @@ Provides a list of the security groups available to the currently configured OpenStack account. Each group may have multiple rules. This data may be useful when choosing your security group(s) to pass to the `knife openstack server create` subcommand. knife openstack network list -------------------- -Lists the networks available to the currently configured OpenStack account. This data may be useful when choosing your networks to pass to the `knife openstack server create` subcommand. This command is only available with OpenStack deployments using the Neutron network service (not nova-network). Please see `knife openstack server delete --help` for all of the supported options. +Lists the networks available to the currently configured OpenStack account. This data may be useful when choosing your networks to pass to the `knife openstack server create` subcommand. This command is only available with OpenStack deployments using the Neutron network service (not nova-network). Please see `knife openstack server create --help` for all of the supported options. # License # Author:: Seth Chisamore (<schisamo@getchef.com>)