Expose neutron_url_timeout
Merge pull request #358 from rossella/release/roxy/master

Expose neutron_url_timeout
Merge branch 'release/roxy/master' into merge-roxy
Merge pull request #366 from vuntz/merge-roxy

Merge roxy branch into stoney
Merge pull request #367 from dirkmueller/release/stoney/master

Fix admin_url misuse
add travis testing support
Add optional crowbar-applied boolean attribute to schema

We add a crowbar applied attribute to mark the proposal as applied after
the chef run. This allows the UI to show that the current form of the
proposal has been 'applied' successfully (i.e. chef-client completed the
run w/ success) and that the proposal was not modified after that.

Update the proposal_schema_revision, so we can add the attribute to
schema for ('3rd party') barclamps that currently do not have it.

Refs: crowbar/crowbar#2044 (which adds this attribute to barclamps which
lack it), crowbar/barclamp-crowbar#1068 (which marks the proposals as
applied) and https://bugzilla.novell.com/show_bug.cgi?id=877486
Merge pull request #371 from bkutil/add_applied_attribute

Add optional crowbar-applied boolean attribute to schema
Merge pull request #370 from dirkmueller/master

add travis testing support
Use secure password

We really want to protect this from accidental
guessing.
Merge pull request #372 from dirkmueller/security

Use secure password
fix nova.conf permissions

file should be readable by nova, but only modifiable by root
Merge pull request #373 from mapleoin/user-group

fix nova.conf permissions
Ignore return value of open-iscsi start

the open-iscsi start command incorrectly returns "failed"
when there is no active sessions. It is quite normal that
there is no active session initially before the service
started..
Merge pull request #374 from dirkmueller/master

Ignore return value of open-iscsi start
Make Nova V3 API optional and disabled by default

It seems upstream decided to put v3 off by default for
icehouse. So adjust our cookbook accordingly.
Merge pull request #375 from dirkmueller/master

Make Nova V3 API optional and disabled by default
Synchronize nova.conf template with Icehouse

It's a huge patch, but with no functional change.
Set control_exchange to nova in nova.conf

This is what ceilometer expects (instead of the openstack value).
Merge pull request #376 from vuntz/icehouse-conf

Synchronize nova.conf template with Icehouse