Merge pull request #43 from jaypipes/working
Revert "Foodcritic cleanups"
This commit is contained in:
commit
b103532b4e
|
@ -159,7 +159,7 @@ default["nova"]["ratelimit"]["api"]["enabled"] = true
|
||||||
default["nova"]["api"]["signing_dir"] = "/tmp/keystone-sign-nova"
|
default["nova"]["api"]["signing_dir"] = "/tmp/keystone-sign-nova"
|
||||||
|
|
||||||
case platform
|
case platform
|
||||||
when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
|
when "fedora", "redhat", "centos"
|
||||||
default["nova"]["platform"] = {
|
default["nova"]["platform"] = {
|
||||||
"api_ec2_packages" => ["openstack-nova-api"],
|
"api_ec2_packages" => ["openstack-nova-api"],
|
||||||
"api_ec2_service" => "openstack-nova-api",
|
"api_ec2_service" => "openstack-nova-api",
|
||||||
|
|
|
@ -50,7 +50,7 @@ end
|
||||||
service "nova-api-ec2" do
|
service "nova-api-ec2" do
|
||||||
service_name platform_options["api_ec2_service"]
|
service_name platform_options["api_ec2_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action :enable
|
action :enable
|
||||||
end
|
end
|
||||||
|
@ -145,5 +145,5 @@ template "/etc/nova/api-paste.ini" do
|
||||||
"service_password" => service_pass
|
"service_password" => service_pass
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['nova-api-ec2']
|
notifies :restart, resources(:service => "nova-api-ec2"), :delayed
|
||||||
end
|
end
|
||||||
|
|
|
@ -50,7 +50,7 @@ end
|
||||||
service "nova-api-metadata" do
|
service "nova-api-metadata" do
|
||||||
service_name platform_options["nova_api_metadata_service"]
|
service_name platform_options["nova_api_metadata_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action :enable
|
action :enable
|
||||||
end
|
end
|
||||||
|
@ -72,5 +72,5 @@ template "/etc/nova/api-paste.ini" do
|
||||||
"service_password" => service_pass
|
"service_password" => service_pass
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['nova-api-metadata']
|
notifies :restart, resources(:service => "nova-api-metadata"), :delayed
|
||||||
end
|
end
|
||||||
|
|
|
@ -50,7 +50,7 @@ end
|
||||||
service "nova-api-os-compute" do
|
service "nova-api-os-compute" do
|
||||||
service_name platform_options["api_os_compute_service"]
|
service_name platform_options["api_os_compute_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action :enable
|
action :enable
|
||||||
end
|
end
|
||||||
|
@ -144,5 +144,5 @@ template "/etc/nova/api-paste.ini" do
|
||||||
"service_password" => service_pass
|
"service_password" => service_pass
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['nova-api-os-compute']
|
notifies :restart, resources(:service => "nova-api-os-compute"), :delayed
|
||||||
end
|
end
|
||||||
|
|
|
@ -54,7 +54,7 @@ end
|
||||||
service "nova-compute" do
|
service "nova-compute" do
|
||||||
service_name platform_options["nova_compute_service"]
|
service_name platform_options["nova_compute_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action :enable
|
action :enable
|
||||||
end
|
end
|
||||||
|
|
|
@ -78,7 +78,7 @@ template "/etc/libvirt/libvirtd.conf" do
|
||||||
:auth_tcp => node["nova"]["libvirt"]["auth_tcp"]
|
:auth_tcp => node["nova"]["libvirt"]["auth_tcp"]
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['libvirt-bin'], :immediately
|
notifies :restart, resources(:service => "libvirt-bin"), :immediately
|
||||||
end
|
end
|
||||||
|
|
||||||
template "/etc/default/libvirt-bin" do
|
template "/etc/default/libvirt-bin" do
|
||||||
|
@ -87,7 +87,7 @@ template "/etc/default/libvirt-bin" do
|
||||||
group "root"
|
group "root"
|
||||||
mode 00644
|
mode 00644
|
||||||
|
|
||||||
notifies :restart, service['libvirt-bin'], :immediately
|
notifies :restart, resources(:service => "libvirt-bin"), :immediately
|
||||||
|
|
||||||
only_if { platform? %w{ubuntu debian} }
|
only_if { platform? %w{ubuntu debian} }
|
||||||
end
|
end
|
||||||
|
@ -98,7 +98,7 @@ template "/etc/sysconfig/libvirtd" do
|
||||||
group "root"
|
group "root"
|
||||||
mode 00644
|
mode 00644
|
||||||
|
|
||||||
notifies :restart, service['libvirt-bin'], :immediately
|
notifies :restart, resources(:service => "libvirt-bin"), :immediately
|
||||||
|
|
||||||
only_if { platform? %w{fedora redhat centos} }
|
only_if { platform? %w{fedora redhat centos} }
|
||||||
end
|
end
|
||||||
|
|
|
@ -32,7 +32,7 @@ end
|
||||||
service "nova-network" do
|
service "nova-network" do
|
||||||
service_name platform_options["nova_network_service"]
|
service_name platform_options["nova_network_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action :enable
|
action :enable
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,7 +31,7 @@ end
|
||||||
service "nova-cert" do
|
service "nova-cert" do
|
||||||
service_name platform_options["nova_cert_service"]
|
service_name platform_options["nova_cert_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action :enable
|
action :enable
|
||||||
end
|
end
|
||||||
|
|
|
@ -103,14 +103,13 @@ template "/etc/nova/nova.conf" do
|
||||||
mode 00644
|
mode 00644
|
||||||
variables(
|
variables(
|
||||||
:sql_connection => sql_connection,
|
:sql_connection => sql_connection,
|
||||||
|
:vncserver_listen => "0.0.0.0",
|
||||||
:vncserver_proxyclient_address => novnc_proxy_endpoint.host,
|
:vncserver_proxyclient_address => novnc_proxy_endpoint.host,
|
||||||
:novncproxy_base_url => novnc_endpoint.to_s,
|
:novncproxy_base_url => novnc_endpoint.to_s,
|
||||||
:xvpvncproxy_bind_host => xvpvnc_endpoint.host,
|
:xvpvncproxy_bind_host => xvpvnc_endpoint.host,
|
||||||
:xvpvncproxy_bind_port => xvpvnc_endpoint.port,
|
:xvpvncproxy_bind_port => xvpvnc_endpoint.port,
|
||||||
:xvpvncproxy_base_url => xvpvnc_endpoint.to_s,
|
:xvpvncproxy_base_url => xvpvnc_endpoint.to_s,
|
||||||
:rabbit_ipaddress => rabbit_info["host"],
|
:rabbit_ipaddress => rabbit_info["host"],
|
||||||
#TODO(retr0h): Will be changed with our HA work
|
|
||||||
:rabbit_password => "guest",
|
|
||||||
:rabbit_port => rabbit_info["port"],
|
:rabbit_port => rabbit_info["port"],
|
||||||
:identity_endpoint => identity_endpoint,
|
:identity_endpoint => identity_endpoint,
|
||||||
# TODO(jaypipes): No support here for >1 image API servers
|
# TODO(jaypipes): No support here for >1 image API servers
|
||||||
|
@ -123,7 +122,7 @@ template "/etc/nova/nova.conf" do
|
||||||
end
|
end
|
||||||
|
|
||||||
template "/etc/nova/rootwrap.conf" do
|
template "/etc/nova/rootwrap.conf" do
|
||||||
source "rootwrap.conf.erb"
|
source "rootwrap.conf"
|
||||||
# Must be root!
|
# Must be root!
|
||||||
owner "root"
|
owner "root"
|
||||||
group "root"
|
group "root"
|
||||||
|
@ -131,7 +130,7 @@ template "/etc/nova/rootwrap.conf" do
|
||||||
end
|
end
|
||||||
|
|
||||||
template "/etc/nova/rootwrap.d/api-metadata.filters" do
|
template "/etc/nova/rootwrap.d/api-metadata.filters" do
|
||||||
source "rootwrap.d/api-metadata.filters.erb"
|
source "rootwrap.d/api-metadata.filters"
|
||||||
# Must be root!
|
# Must be root!
|
||||||
owner "root"
|
owner "root"
|
||||||
group "root"
|
group "root"
|
||||||
|
@ -139,7 +138,7 @@ template "/etc/nova/rootwrap.d/api-metadata.filters" do
|
||||||
end
|
end
|
||||||
|
|
||||||
template "/etc/nova/rootwrap.d/compute.filters" do
|
template "/etc/nova/rootwrap.d/compute.filters" do
|
||||||
source "rootwrap.d/compute.filters.erb"
|
source "rootwrap.d/compute.filters"
|
||||||
# Must be root!
|
# Must be root!
|
||||||
owner "root"
|
owner "root"
|
||||||
group "root"
|
group "root"
|
||||||
|
@ -147,7 +146,7 @@ template "/etc/nova/rootwrap.d/compute.filters" do
|
||||||
end
|
end
|
||||||
|
|
||||||
template "/etc/nova/rootwrap.d/network.filters" do
|
template "/etc/nova/rootwrap.d/network.filters" do
|
||||||
source "rootwrap.d/network.filters.erb"
|
source "rootwrap.d/network.filters"
|
||||||
# Must be root!
|
# Must be root!
|
||||||
owner "root"
|
owner "root"
|
||||||
group "root"
|
group "root"
|
||||||
|
@ -168,12 +167,14 @@ template "/root/openrc" do
|
||||||
:tenant => ksadmin_tenant_name,
|
:tenant => ksadmin_tenant_name,
|
||||||
:password => ksadmin_pass,
|
:password => ksadmin_pass,
|
||||||
:identity_admin_endpoint => identity_admin_endpoint,
|
:identity_admin_endpoint => identity_admin_endpoint,
|
||||||
|
:nova_api_ipaddress => nova_api_endpoint.host,
|
||||||
:nova_api_version => "1.1",
|
:nova_api_version => "1.1",
|
||||||
:auth_strategy => "keystone",
|
:auth_strategy => "keystone",
|
||||||
:ec2_url => ec2_public_endpoint.to_s
|
:ec2_url => ec2_public_endpoint.to_s
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
execute "enable nova login" do
|
execute "enable nova login" do
|
||||||
command "usermod -s /bin/sh nova"
|
command "usermod -s /bin/sh nova"
|
||||||
end
|
end
|
||||||
|
|
|
@ -40,7 +40,7 @@ end
|
||||||
service "nova-scheduler" do
|
service "nova-scheduler" do
|
||||||
service_name platform_options["nova_scheduler_service"]
|
service_name platform_options["nova_scheduler_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action [:enable, :start]
|
action [:enable, :start]
|
||||||
end
|
end
|
||||||
|
|
|
@ -39,7 +39,7 @@ end
|
||||||
service "nova-vncproxy" do
|
service "nova-vncproxy" do
|
||||||
service_name platform_options["nova_vncproxy_service"]
|
service_name platform_options["nova_vncproxy_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action :enable
|
action :enable
|
||||||
end
|
end
|
||||||
|
@ -47,7 +47,7 @@ end
|
||||||
service "nova-consoleauth" do
|
service "nova-consoleauth" do
|
||||||
service_name platform_options["nova_vncproxy_consoleauth_service"]
|
service_name platform_options["nova_vncproxy_consoleauth_service"]
|
||||||
supports :status => true, :restart => true
|
supports :status => true, :restart => true
|
||||||
subscribes :restart, resources("template['/etc/nova/nova.conf']")
|
subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
|
||||||
|
|
||||||
action [ :enable, :start ]
|
action [ :enable, :start ]
|
||||||
end
|
end
|
||||||
|
|
|
@ -16,8 +16,8 @@ state_path=/var/lib/nova
|
||||||
lock_path=/var/lock/nova
|
lock_path=/var/lock/nova
|
||||||
|
|
||||||
##### RABBITMQ #####
|
##### RABBITMQ #####
|
||||||
rabbit_password=<%= @rabbit_password %>
|
rabbit_password=guest
|
||||||
rabbit_port=<%= @rabbit_port %>
|
rabbit_port=5672
|
||||||
rabbit_host=<%= @rabbit_ipaddress %>
|
rabbit_host=<%= @rabbit_ipaddress %>
|
||||||
|
|
||||||
##### SCHEDULER #####
|
##### SCHEDULER #####
|
||||||
|
|
Loading…
Reference in New Issue