Skip to content

Commit ef2c064

Browse files
perfectsineperfectsine
committed
A lot of changes coming. Working on Docker support. Deprecating use of roles. Minor fixes to code base.
1 parent df0f260 commit ef2c064

36 files changed

Lines changed: 104 additions & 234 deletions

‎attributes/default.rb‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,18 @@
2828
'time.service.networklayer.com']
2929

3030

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'
31+
# Cluster setup
32+
# '<variable name>' => '<chef recipe name>'
33+
default['admin']['cloud_network']['recipes'] = {
34+
'controller' => 'controller',
35+
'network' => 'neutron-network',
36+
'rabbitmq' => 'rabbitmq-server',
37+
'keystone' => 'keystone',
38+
'glance' => 'glance',
39+
'cinder' => 'cinder',
40+
'mysqlglance' => 'mysql-glance',
41+
'mysqlcinder' => 'mysql-cinder',
42+
'mysqlkeystone' => 'mysql-keystone',
43+
'mysqlnova' => 'mysql-nova',
44+
'mysqlneutron' => 'mysql-neutron'
4945
}

‎metadata.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
description 'Installs and configures an OpenStack Havana cluster'
66
supports 'ubuntu', '= 12.04'
77
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8-
version '0.3.3'
8+
version '0.4.0'
99
depends 'partial_search'
1010
depends 'mysql'
1111
depends 'ntp'

‎recipes/cinder.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include_recipe 'chef-openstack::common'
2+
13
packages = %w[cinder-api
24
cinder-scheduler
35
cinder-volume

‎recipes/common.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
include_recipe 'chef-openstack::set_attributes'
2+
include_recipe 'chef-openstack::set_cloudnetwork'
3+
include_recipe 'chef-openstack::ip_forwarding'
4+
include_recipe 'ntp'
5+
include_recipe 'chef-openstack::repositories'

‎recipes/controller.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include_recipe 'chef-openstack::common'
2+
include_recipe "chef-openstack::neutron-controller"
3+
include_recipe "chef-openstack::nova-controller"
4+
include_recipe "chef-openstack::dashboard"

‎recipes/dashboard.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include_recipe 'chef-openstack::common'
2+
13
packages = %w[openstack-dashboard
24
apache2
35
libapache2-mod-wsgi

‎recipes/glance.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
include_recipe 'chef-openstack::common'
2+
3+
14
packages = %w[glance
25
glance-api
36
glance-registry

‎recipes/keystone.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include_recipe 'chef-openstack::common'
2+
13
packages = %w[keystone
24
python-keystone
35
python-keystoneclient

‎recipes/mysql-cinder.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_recipe 'chef-openstack::apparmor'
2-
include_recipe 'mysql::server'
1+
include_recipe 'chef-openstack::mysql-common'
32

43
bash 'create database for cinder' do
54
not_if("mysql -uroot -p#{node['mysql']['server_root_password']} -e 'SHOW DATABASES' | grep #{node['cinder']['db']['name']}")

recipes/apparmor.rb renamed to recipes/mysql-common.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
package 'apparmor' do
22
action :purge
33
end
4+
5+
include_recipe 'mysql::server'

0 commit comments

Comments
 (0)