Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'havana' of github.com:rcbops-cookbooks/nova

Conflicts:
	attributes/default.rb
	metadata.rb
	templates/default/nova.conf.erb
  • Loading branch information...
commit 2b827a5880c778edcfe6ace166b19d5778d3989c 2 parents baa5883 + 768afb3
@willkelly willkelly authored
View
2  VERSION
@@ -1 +1 @@
-4.1.3
+4.2.0
View
8 attributes/default.rb
@@ -198,7 +198,7 @@
"nova_cert_service" => "openstack-nova-cert",
"nova_cert_procmatch" => procmatch_base + 'nova-cert\b',
- "nova_compute_packages" => [ "openstack-nova-compute", "dnsmasq-utils" ],
+ "nova_compute_packages" => [ "openstack-nova-compute", "dnsmasq-utils", "python-libguestfs" ],
"nova_compute_service" => "openstack-nova-compute",
"nova_compute_procmatch" => procmatch_base + 'nova-compute\b',
@@ -228,7 +228,7 @@
"libvirt_packages" => ["libvirt"],
"libvirt_service" => "libvirtd",
"mysql_service" => "mysqld",
- "package_overrides" => ""
+ "package_options" => ""
}
default["nova"]["ssl"]["dir"] = "/etc/pki/tls"
@@ -268,7 +268,7 @@
"nova_cert_service" => "nova-cert",
"nova_cert_procmatch" => procmatch_base + 'nova-cert\b',
- "nova_compute_packages" => ["nova-compute"],
+ "nova_compute_packages" => ["nova-compute", "python-guestfs"],
"nova_compute_service" => "nova-compute",
"nova_compute_procmatch" => procmatch_base + 'nova-compute\b',
@@ -301,7 +301,7 @@
"libvirt_packages" => ["libvirt-bin", "python-libvirt", "pm-utils"],
"libvirt_service" => "libvirt-bin",
"mysql_service" => "mysql",
- "package_overrides" =>
+ "package_options" =>
"-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
}
default["nova"]["ssl"]["dir"] = "/etc/ssl"
View
28 providers/conf.rb
@@ -56,13 +56,13 @@
end
net_provider = node["nova"]["network"]["provider"]
- if net_provider == "quantum"
+ if net_provider == "neutron"
# Get settings from recipe[nova-network::nova-controller]
recipe = "nova-network::nova-controller"
- quantum_info = get_settings_by_recipe(recipe, "quantum")
- # Search for quantum enpoint info
+ neutron_info = get_settings_by_recipe(recipe, "neutron")
+ # Search for neutron enpoint info
nova_net_role = "nova-network-controller"
- quantum_endpoint = get_access_endpoint(nova_net_role, "quantum", "api")
+ neutron_endpoint = get_access_endpoint(nova_net_role, "neutron", "api")
# Search for nova api endpoint info
nova_info = get_access_endpoint("nova-api-os-compute", "nova", "api")
metadata_ip = nova_info["host"]
@@ -70,7 +70,7 @@
platform_options = node["nova"]["platform"]
- # Case nova or quantum
+ # Case nova or neutron
# network_options assemble hash here
network_options = {}
case net_provider
@@ -90,21 +90,21 @@
network_options["fixed_ip_disassociate_timeout"] = node[net_provider]["network"]["fixed_ip_disassociate_timeout"]
#network_options["use_single_default_gateway"] = node[net_provider]["config"]["use_single_default_gateway"]
#network_options["virt_type"] = node[net_provider]["libvirt"]["virt_type"]
- when "quantum"
- network_options["quantum_url"] = quantum_endpoint["uri"]
- network_options["quantum_admin_tenant_name"] = quantum_info["service_tenant_name"]
- network_options["quantum_admin_username"] = quantum_info["service_user"]
- network_options["quantum_admin_password"] = quantum_info["service_pass"]
- network_options["quantum_admin_auth_url"] = ks_admin_endpoint["uri"]
+ when "neutron"
+ network_options["neutron_url"] = neutron_endpoint["uri"]
+ network_options["neutron_admin_tenant_name"] = neutron_info["service_tenant_name"]
+ network_options["neutron_admin_username"] = neutron_info["service_user"]
+ network_options["neutron_admin_password"] = neutron_info["service_pass"]
+ network_options["neutron_admin_auth_url"] = ks_admin_endpoint["uri"]
network_options["network_api_class"] = node[net_provider]["network_api_class"]
- network_options["quantum_auth_strategy"] = node[net_provider]["auth_strategy"]
+ network_options["neutron_auth_strategy"] = node[net_provider]["auth_strategy"]
network_options["libvirt_vif_driver"] = node[net_provider]["libvirt_vif_driver"]
network_options["libvirt_vif_type"] = node[net_provider]["libvirt_vif_type"]
network_options["linuxnet_interface_driver"] = node[net_provider]["linuxnet_interface_driver"]
network_options["firewall_driver"] = node[net_provider]["firewall_driver"]
network_options["security_group_api"] = node[net_provider]["security_group_api"]
- network_options["service_quantum_metadata_proxy"] = node[net_provider]["service_quantum_metadata_proxy"]
- network_options["quantum_metadata_proxy_shared_secret"] = quantum_info["quantum_metadata_proxy_shared_secret"]
+ network_options["service_neutron_metadata_proxy"] = node[net_provider]["service_neutron_metadata_proxy"]
+ network_options["neutron_metadata_proxy_shared_secret"] = neutron_info["neutron_metadata_proxy_shared_secret"]
network_options["metadata_host"] = metadata_ip
end
View
2  recipes/api-ec2.rb
@@ -37,7 +37,7 @@
platform_options["api_ec2_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
2  recipes/api-metadata.rb
@@ -33,7 +33,7 @@
platform_options["api_metadata_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
2  recipes/api-os-compute.rb
@@ -37,7 +37,7 @@
platform_options["api_os_compute_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
4 recipes/api-os-volume.rb
@@ -30,13 +30,13 @@
package "python-keystone" do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
platform_options["api_os_volume_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
4 recipes/compute.rb
@@ -39,7 +39,7 @@
nova_compute_packages.each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
@@ -57,7 +57,7 @@
cinder_multipath_packages.each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
template "/etc/multipath.conf" do
View
2  recipes/libvirt.rb
@@ -22,7 +22,7 @@
platform_options["libvirt_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
2  recipes/nova-cert.rb
@@ -23,7 +23,7 @@
platform_options["nova_cert_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
2  recipes/nova-conductor.rb
@@ -24,7 +24,7 @@
platform_options["nova_conductor_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
2  recipes/scheduler.rb
@@ -30,7 +30,7 @@
platform_options["nova_scheduler_packages"].each do |pkg|
package pkg do
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
end
end
View
4 recipes/vncproxy.rb
@@ -24,7 +24,7 @@
platform_options["nova_vncproxy_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
@@ -32,7 +32,7 @@
platform_options["nova_vncproxy_consoleauth_packages"].each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
- options platform_options["package_overrides"]
+ options platform_options["package_options"]
end
end
View
1  templates/default/nova.conf.erb
@@ -53,6 +53,7 @@ quota_security_group_rules=<%= @quota_security_group_rules %>
quota_fixed_ips=<%= @quota_fixed_ips %>
quota_instances=<%= @quota_instances %>
max_age=<%= @max_age %>
+rpc_backend=nova.openstack.common.rpc.impl_kombu
<% if @force_config_drive -%>
force_config_drive=<%= @force_config_drive %>
<% end -%>
Please sign in to comment.
Something went wrong with that request. Please try again.