Skip to content

Commit 39f52fc

Browse files
perfectsineperfectsine
committed
Merge pull request #1 from briancline/general-prep-stuff
Apply coding standards globally, minor doc updates
2 parents 55238e6 + 0f4f9a7 commit 39f52fc

69 files changed

Lines changed: 2327 additions & 2142 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
# CHANGELOG for openstack-grizzly
1+
# CHANGELOG for OpenStack Havana recipes
22

3-
## 0.1.0:
3+
## 0.3.3:
44

5-
* Initial release
5+
* Updated readme
6+
* Brought most code in line with community-accepted Ruby coding standards: https://github.com/styleguide/ruby
7+
* Consolidated some code to read easier and provide better maintainability
8+
* Correct case of SoftLayer, OpenStack, component names, etc.
9+
10+
11+
## 0.3.0 - 0.3.2:
12+
13+
* Release of OpenStack Havana recipes
614

715

816
## 0.2.0:
917

10-
* Release of OpenStack Grizzly
18+
* Release of OpenStack Grizzly recipes
19+
1120

21+
## 0.1.0:
1222

13-
## 0.3.0:
23+
* Initial release
1424

15-
* Release of OpenStack Havana

‎README.md‎

Lines changed: 264 additions & 262 deletions
Large diffs are not rendered by default.

‎attributes/cinder.rb‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
default["cinder"]["db"]["name"] = "cinder"
2-
default["cinder"]["db"]["username"] = "cinder"
3-
default["cinder"]["db"]["password"] = "c1nd3r"
1+
default['cinder']['db']['name'] = 'cinder'
2+
default['cinder']['db']['username'] = 'cinder'
3+
default['cinder']['db']['password'] = 'c1nd3r'
44

5-
default["cinder"]["service_tenant_name"] = "service"
6-
default["cinder"]["service_user"] = "cinder"
5+
default['cinder']['service_tenant_name'] = 'service'
6+
default['cinder']['service_user'] = 'cinder'
77

8-
default["cinder"]["config"]["rabbit_password"] = "guest"
9-
default["cinder"]["config"]["auth_strategy"] = "keystone"
10-
default["cinder"]["config"]["volume_group"] = "cinder-volumes"
8+
default['cinder']['config']['rabbit_password'] = 'guest'
9+
default['cinder']['config']['auth_strategy'] = 'keystone'
10+
default['cinder']['config']['volume_group'] = 'cinder-volumes'
1111

12-
if node["virtualization"]["role"] == "guest"
13-
#Softlayer virtual server instances use this naming convention.
14-
default["cinder"]["config"]["lvm_disk"] = "/dev/xvdc"
12+
if node['virtualization']['role'] == 'guest'
13+
# Virtualized hosts running on XenServer (i.e., for dev/testing) will
14+
# cause secondary disks to be presented as /dev/xvdc, assuming xvdb is swap
15+
default['cinder']['config']['lvm_disk'] = '/dev/xvdc'
1516
else
16-
default["cinder"]["config"]["lvm_disk"] = "/dev/sdb"
17+
default['cinder']['config']['lvm_disk'] = '/dev/sdb'
1718
end

‎attributes/default.rb‎

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,49 @@
1-
#Default's for Chef Environment
2-
default["admin"]["password"]="passwordsf"
3-
default["admin"]["email"]="[email protected]"
4-
default["admin"]["debug"]="False"
5-
default["admin"]["banner"] = "#Generated by Chef for Openstack. Changes will be overwritten.
6-
#SoftLayer, an IBM Company"
7-
8-
#Use eth1 and eth0 if provisioning CCI's or custom hardware. Softlayer's hardware servers use bond1 and bond0.
9-
#default["network"]["public_interface"] = "bond1"
10-
#default["network"]["private_interface"] = "bond0"
11-
default["network"]["public_interface"] = "eth1"
12-
default["network"]["private_interface"] = "eth0"
13-
14-
15-
#Mysql cookbook overrides
16-
override['mysql']['bind_address']="0.0.0.0"
17-
override['mysql']['remove_test_database']=true
18-
override['mysql']['remove_anonymous_users']=true
19-
override['mysql']['tunable']['innodb_thread_concurrency'] = "0"
20-
override['mysql']['tunable']['innodb_commit_concurrency'] = "0"
21-
override['mysql']['tunable']['innodb_read_io_threads'] = "64"
22-
override['mysql']['tunable']['innodb_write_io_threads'] = "64"
23-
24-
#NTP cookbook overrides
25-
override['ntp']['servers']=["time.softlayer.com", "time.service.networklayer.com"]
26-
27-
#Cloud network setup
28-
#"<variable name>" => "<Chef role name>"
29-
#By default the mysql recipes are seperated, if the openstack-mysql-all role is used set_cloudnetwork will set the correct recipe.
30-
default["admin"]["cloud_network"]["roles"] = {
31-
32-
"controller" => "openstack-controller",
33-
"network" => "openstack-network",
34-
"rabbitmq" => "openstack-rabbitmq",
35-
"keystone" => "openstack-keystone",
36-
"glance" => "openstack-glance",
37-
"cinder" => "openstack-cinder",
38-
"mysqlglance" => "openstack-mysql-glance",
39-
"mysqlcinder" => "openstack-mysql-cinder",
40-
"mysqlkeystone" => "openstack-mysql-keystone",
41-
"mysqlnova" => "openstack-mysql-nova",
42-
"mysqlneutron" => "openstack-mysql-neutron"
43-
}
1+
# Defaults for Chef environment
2+
default['admin']['password'] = 'passwordsf'
3+
default['admin']['email'] = '[email protected]'
4+
default['admin']['debug'] = 'False'
5+
default['admin']['banner'] = '# Generated by SoftLayer OpenStack Cookbooks.' \
6+
' Changes will be overwritten by chef-client.'
7+
8+
# Use eth1 and eth0 if provisioning CCI's or custom hardware.
9+
# Softlayer's hardware servers use bond1 and bond0.
10+
# default['network']['public_interface'] = 'bond1'
11+
# default['network']['private_interface'] = 'bond0'
12+
default['network']['public_interface'] = 'eth1'
13+
default['network']['private_interface'] = 'eth0'
14+
15+
16+
# MySQL cookbook overrides
17+
override['mysql']['bind_address'] = '0.0.0.0'
18+
override['mysql']['remove_test_database'] = true
19+
override['mysql']['remove_anonymous_users'] = true
20+
override['mysql']['tunable']['innodb_thread_concurrency'] = '0'
21+
override['mysql']['tunable']['innodb_commit_concurrency'] = '0'
22+
override['mysql']['tunable']['innodb_read_io_threads'] = '64'
23+
override['mysql']['tunable']['innodb_write_io_threads'] = '64'
24+
25+
26+
# NTP cookbook overrides
27+
override['ntp']['servers'] = ['time.softlayer.com',
28+
'time.service.networklayer.com']
29+
30+
31+
# Cloud network setup
32+
# '<variable name>' => '<Chef role name>'
33+
34+
# By default, the MySQL recipes are seperated. If the openstack-mysql-all role
35+
# is used, set_cloudnetwork will set the correct recipe.
36+
37+
default['admin']['cloud_network']['roles'] = {
38+
'controller' => 'openstack-controller',
39+
'network' => 'openstack-network',
40+
'rabbitmq' => 'openstack-rabbitmq',
41+
'keystone' => 'openstack-keystone',
42+
'glance' => 'openstack-glance',
43+
'cinder' => 'openstack-cinder',
44+
'mysqlglance' => 'openstack-mysql-glance',
45+
'mysqlcinder' => 'openstack-mysql-cinder',
46+
'mysqlkeystone' => 'openstack-mysql-keystone',
47+
'mysqlnova' => 'openstack-mysql-nova',
48+
'mysqlneutron' => 'openstack-mysql-neutron'
49+
}

‎attributes/glance.rb‎

Lines changed: 48 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,49 @@
1-
default["glance"]["db"]["name"] = "glance"
2-
default["glance"]["db"]["username"] = "glance"
3-
default["glance"]["db"]["password"] = "gl4nc3"
4-
5-
default["glance"]["service_tenant_name"] = "service"
6-
default["glance"]["service_user"] = "glance"
7-
8-
#Glance API
9-
default["glance"]["config"]["debug"] = "false"
10-
default["glance"]["config"]["verbose"] = "false"
11-
default["glance"]["config"]["bind_host"]["api"] = "0.0.0.0"
12-
default["glance"]["config"]["bind_port"]["api"] = "9292"
13-
default["glance"]["config"]["log_file"]["api"] = "/var/log/glance/api.log"
14-
default["glance"]["config"]["workers"] = "10"
15-
default["glance"]["config"]["allow_anonymous_access"] = "False"
16-
default["glance"]["config"]["show_image_direct_url"] = "True"
17-
default["glance"]["config"]["notifier_strategy"] = "noop"
18-
default["glance"]["config"]["filesystem_store_datadir"] = "/var/lib/glance/images/"
19-
default["glance"]["config"]["image_cache_dir"] = "/var/lib/glance/image-cache/"
20-
default["glance"]["config"]["flavor"] = "keystone"
21-
22-
#RABBIT config
23-
default["glance"]["config"]["rabbit_port"] = "5672"
24-
default["glance"]["config"]["rabbit_use_ssl"] = "false"
25-
default["glance"]["config"]["rabbit_userid"] = "guest"
26-
default["glance"]["config"]["rabbit_password"] = "guest"
27-
default["glance"]["config"]["rabbit_notification_exchange"] = "glance"
28-
default["glance"]["config"]["rabbit_notification_topic"] = "notifications"
29-
default["glance"]["config"]["rabbit_durable_queues"] = "False"
30-
31-
#Glance Registry
32-
default["glance"]["config"]["bind_host"]["registry"] = "0.0.0.0"
33-
default["glance"]["config"]["bind_port"]["registry"] = "9191"
34-
default["glance"]["config"]["log_file"]["registry"] = "/var/log/glance/registry.log"
35-
36-
37-
default["glance"]["images"] = {
38-
"CirrOS 0.3.0 i386" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-i386-disk.img",
39-
"CirrOS 0.3.0 x86_64" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img",
40-
"Fedora 19 (Cloud) i386" => "http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/x86_64/Fedora-x86_64-19-20130627-sda.qcow2",
41-
"Fedora 19 (Cloud) x86_64" => "http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/i386/Fedora-i386-19-20130627-sda.qcow2",
42-
"Ubuntu 12.04 Server (Cloud) amd64" => "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img",
43-
"Ubuntu 12.04 Server (Cloud) i386" => "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-i386-disk1.img",
44-
"Ubuntu 12.10 Server (Cloud) amd64" => "http://cloud-images.ubuntu.com/quantal/current/quantal-server-cloudimg-amd64-disk1.img",
45-
"Ubuntu 12.10 Server (Cloud) i386" => "http://cloud-images.ubuntu.com/quantal/current/quantal-server-cloudimg-i386-disk1.img",
46-
"Ubuntu 13.04 Server (Cloud) amd64" => "http://cloud-images.ubuntu.com/raring/current/raring-server-cloudimg-amd64-disk1.img",
47-
"Ubuntu 13.04 Server (Cloud) i386" => "http://cloud-images.ubuntu.com/raring/current/raring-server-cloudimg-i386-disk1.img"
1+
default['glance']['db']['name'] = 'glance'
2+
default['glance']['db']['username'] = 'glance'
3+
default['glance']['db']['password'] = 'gl4nc3'
4+
5+
default['glance']['service_tenant_name'] = 'service'
6+
default['glance']['service_user'] = 'glance'
7+
8+
# Glance API
9+
default['glance']['config']['debug'] = 'false'
10+
default['glance']['config']['verbose'] = 'false'
11+
default['glance']['config']['bind_host']['api'] = '0.0.0.0'
12+
default['glance']['config']['bind_port']['api'] = '9292'
13+
default['glance']['config']['log_file']['api'] = '/var/log/glance/api.log'
14+
default['glance']['config']['workers'] = '10'
15+
default['glance']['config']['allow_anonymous_access'] = 'False'
16+
default['glance']['config']['show_image_direct_url'] = 'True'
17+
default['glance']['config']['notifier_strategy'] = 'noop'
18+
default['glance']['config']['filesystem_store_datadir'] = '/var/lib/glance/images/'
19+
default['glance']['config']['image_cache_dir'] = '/var/lib/glance/image-cache/'
20+
default['glance']['config']['flavor'] = 'keystone'
21+
22+
# RabbitMQ config
23+
default['glance']['config']['rabbit_port'] = '5672'
24+
default['glance']['config']['rabbit_use_ssl'] = 'false'
25+
default['glance']['config']['rabbit_userid'] = 'guest'
26+
default['glance']['config']['rabbit_password'] = 'guest'
27+
default['glance']['config']['rabbit_notification_exchange'] = 'glance'
28+
default['glance']['config']['rabbit_notification_topic'] = 'notifications'
29+
default['glance']['config']['rabbit_durable_queues'] = 'False'
30+
31+
# Glance Registry
32+
default['glance']['config']['bind_host']['registry'] = '0.0.0.0'
33+
default['glance']['config']['bind_port']['registry'] = '9191'
34+
default['glance']['config']['log_file']['registry'] = '/var/log/glance/registry.log'
35+
36+
default['glance']['images'] = {
37+
'CirrOS 0.3.0 i386' => 'https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-i386-disk.img',
38+
'CirrOS 0.3.0 x86_64' => 'https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img',
39+
'Fedora 19 (Cloud) i386' => 'http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/x86_64/Fedora-x86_64-19-20130627-sda.qcow2',
40+
'Fedora 19 (Cloud) x86_64' => 'http://download.fedoraproject.org/pub/fedora/linux/releases/19/Images/i386/Fedora-i386-19-20130627-sda.qcow2',
41+
'Ubuntu 12.04 Server (Cloud) amd64' => 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img',
42+
'Ubuntu 12.04 Server (Cloud) i386' => 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-i386-disk1.img',
43+
'Ubuntu 12.10 Server (Cloud) amd64' => 'http://cloud-images.ubuntu.com/quantal/current/quantal-server-cloudimg-amd64-disk1.img',
44+
'Ubuntu 12.10 Server (Cloud) i386' => 'http://cloud-images.ubuntu.com/quantal/current/quantal-server-cloudimg-i386-disk1.img',
45+
'Ubuntu 13.04 Server (Cloud) amd64' => 'http://cloud-images.ubuntu.com/raring/current/raring-server-cloudimg-amd64-disk1.img',
46+
'Ubuntu 13.04 Server (Cloud) i386' => 'http://cloud-images.ubuntu.com/raring/current/raring-server-cloudimg-i386-disk1.img',
47+
'Ubuntu 13.10 Server (Cloud) amd64' => 'http://cloud-images.ubuntu.com/saucy/current/saucy-server-cloudimg-amd64-disk1.img',
48+
'Ubuntu 13.10 Server (Cloud) i386' => 'http://cloud-images.ubuntu.com/saucy/current/saucy-server-cloudimg-i386-disk1.img'
4849
}
49-
50-
51-
52-
53-
54-
55-
56-
57-
58-
59-
60-
61-
62-
63-
64-

0 commit comments

Comments
 (0)