Merge branch 'master' of https://github.com/rcbops-cookbooks/nova
This commit is contained in:
@@ -88,7 +88,8 @@ default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"]
|
||||
default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"]
|
||||
default["nova"]["libvirt"]["auth_tcp"] = "none"
|
||||
default["nova"]["config"]["availability_zone"] = "nova"
|
||||
|
||||
default["nova"]["config"]["default_schedule_zone"] = "nova"
|
||||
default["nova"]["config"]["force_raw_images"] = false
|
||||
# FIXME: OMG!
|
||||
default["nova"]["libvirt"]["ssh"]["private_key"] = "-----BEGIN DSA PRIVATE KEY-----
|
||||
MIIBvAIBAAKBgQDUIz3rg0afavOwNeTJL/112U/l4B08kzZVx+QcflxllpW4sn/f
|
||||
|
@@ -79,8 +79,10 @@ template "/etc/nova/nova.conf" do
|
||||
"scheduler_driver" => node["nova"]["scheduler"]["scheduler_driver"],
|
||||
"scheduler_default_filters" => node["nova"]["scheduler"]["default_filters"].join(","),
|
||||
"availability_zone" => node["nova"]["config"]["availability_zone"],
|
||||
"default_schedule_zone" => node["nova"]["config"]["default_schedule_zone"],
|
||||
"virt_type" => node["nova"]["libvirt"]["virt_type"],
|
||||
"fixed_range" => node["nova"]["network"]["fixed_range"],
|
||||
"force_raw_images" => node["nova"]["config"]["force_raw_images"].to_s,
|
||||
"dmz_cidr" => node["nova"]["network"]["dmz_cidr"]
|
||||
)
|
||||
end
|
||||
|
@@ -24,7 +24,7 @@ rabbit_host=<%= @rabbit_ipaddress %>
|
||||
scheduler_driver=<%= @scheduler_driver %>
|
||||
scheduler_default_filters=<%= @scheduler_default_filters %>
|
||||
node_availability_zone=<%= @availability_zone %>
|
||||
default_schedule_zone=nova
|
||||
default_schedule_zone=<%= @default_schedule_zone %>
|
||||
|
||||
# NETWORK
|
||||
network_manager=<%= @network_manager %>
|
||||
@@ -65,6 +65,7 @@ xvpvncproxy_port=<%= @xvpvncproxy_bind_port %>
|
||||
use_deprecated_auth=false
|
||||
allow_admin_api=true
|
||||
enable_zone_routing=true
|
||||
force_raw_images=<%= @force_raw_images %>
|
||||
|
||||
<% if node["platform"] == "fedora" -%>
|
||||
# Adding support for non-modded euca2ools to display ip address info
|
||||
|
Reference in New Issue
Block a user