openstack/cookbook-openstack-compute
Code Issues Proposed changes

Revert "Foodcritic cleanups"

Browse Source 
This reverts commit e59e131ad8.
This commit is contained in:
Jay Pipes
2013-01-07 11:19:53 -05:00
parent eff4653038
commit 681aa57270
16 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
recipes/nova-common.rb
View File

@@ -103,14 +103,13 @@ template "/etc/nova/nova.conf" do
mode 00644
variables(
:sql_connection => sql_connection,
:vncserver_listen => "0.0.0.0",
:vncserver_proxyclient_address => novnc_proxy_endpoint.host,
:novncproxy_base_url => novnc_endpoint.to_s,
:xvpvncproxy_bind_host => xvpvnc_endpoint.host,
:xvpvncproxy_bind_port => xvpvnc_endpoint.port,
:xvpvncproxy_base_url => xvpvnc_endpoint.to_s,
:rabbit_ipaddress => rabbit_info["host"],
#TODO(retr0h): Will be changed with our HA work
:rabbit_password => "guest",
:rabbit_port => rabbit_info["port"],
:identity_endpoint => identity_endpoint,
# TODO(jaypipes): No support here for >1 image API servers
@@ -123,7 +122,7 @@ template "/etc/nova/nova.conf" do
end
template "/etc/nova/rootwrap.conf" do
source "rootwrap.conf.erb"
source "rootwrap.conf"
# Must be root!
owner "root"
group "root"
@@ -131,7 +130,7 @@ template "/etc/nova/rootwrap.conf" do
end
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!
owner "root"
group "root"
@@ -139,7 +138,7 @@ template "/etc/nova/rootwrap.d/api-metadata.filters" do
end
template "/etc/nova/rootwrap.d/compute.filters" do
source "rootwrap.d/compute.filters.erb"
source "rootwrap.d/compute.filters"
# Must be root!
owner "root"
group "root"
@@ -147,7 +146,7 @@ template "/etc/nova/rootwrap.d/compute.filters" do
end
template "/etc/nova/rootwrap.d/network.filters" do
source "rootwrap.d/network.filters.erb"
source "rootwrap.d/network.filters"
# Must be root!
owner "root"
group "root"
@@ -168,12 +167,14 @@ template "/root/openrc" do
:tenant => ksadmin_tenant_name,
:password => ksadmin_pass,
:identity_admin_endpoint => identity_admin_endpoint,
:nova_api_ipaddress => nova_api_endpoint.host,
:nova_api_version => "1.1",
:auth_strategy => "keystone",
:ec2_url => ec2_public_endpoint.to_s
)
end
execute "enable nova login" do
command "usermod -s /bin/sh nova"
end