Was fixed
nova-multi-controller role should not always conflict with ceph-store

The conflict is only valid if ceph is not used for volume storage.

https://bugzilla.novell.com/show_bug.cgi?id=777850
(cherry picked from commit a9394d51463e38e5cd903579908f3d764b217764)

Signed-off-by: Michal Jura <mjura@suse.com>
Add chef attribute for ram_allocation_ratio config option

The default value is "1.0", which essentially disables host RAM overcommit (bnc#784345)
See http://docs.openstack.org/essex/openstack-compute/admin/content/scheduler-filters.html#ramfilter
(cherry picked from commit 6cc2eeb78c62a091df9af46228649a56513e39c4)

Signed-off-by: Michal Jura <mjura@suse.com>
Add three options to barclamp UI and handle them in chef too

We add support for the auto_assign_floating_ip option for nova-network,
and for cpu_allocation_ratio/ram_allocation_ratio options for
nova-scheduler (ram_allocation_ratio was already a chef attribute, but
with a value not changeable in the barclamp).

Signed-off-by: Vincent Untz <vuntz@suse.com>
(cherry picked from commit 03623e9fbbd656509480c1a36e322c5d8ffce595)

Signed-off-by: Michal Jura <mjura@suse.com>

Conflicts:
	chef/cookbooks/nova/attributes/default.rb
	crowbar.yml
	crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml
default cpu_allocation_ratio to 16

this provides continuity with previous versions of SUSE Cloud 1.0
(cherry picked from commit 5eece7aa1bc5a0b57fcce166bc22820f660e0727)

Signed-off-by: Michal Jura <mjura@suse.com>

Conflicts:
	crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml
Do not mark new options as required

This creates an issue for existing proposals, since the JSON data will
only have the new options if they get changed; most users trying to save
will face an error because of the schema.

Having them not required is okay since the cookbooks is using a sane
default for the values.
(cherry picked from commit e035f0bc1b5c74fc71ee88fd5635c935d5551c88)

Signed-off-by: Michal Jura <mjura@suse.com>
Remove nova user attribute for the proposals

There is no good reason to change the defaults from the default attributes.
use public method file_edited?

file_edited is not exposed in chef, so we have patched our rubygem-chef
package to expose this for now
Repairing nova.conf.erb template with nova.virt.driver