x/compass-core
Code Issues Proposed changes

Merge "modify conf files for ceph-openstack" into dev/experimental

Browse Source
This commit is contained in:
Jenkins 2014-10-07 00:04:46 +00:00 committed by Gerrit Code Review
commit 08873b8b7e
3 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf/flavor/chef_ceph_openstack.conf
View File

@ -6,10 +6,9 @@ FLAVORS = [
'template': 'multinodes.tmpl', 'template': 'multinodes.tmpl',
'roles': [ 'roles': [
'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-compute-controller', 'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-compute-controller',
'ceph-mon', 'ceph-osd', 'ceph-mds', 'ceph-radosgw', 'os-compute-worker', 'ceph-os-mon', 'ceph-osd', 'ceph-mds', 'ceph-os-radosgw',
'os-network-worker', 'os-network-server', 'os-block-storage-controller', 'os-ceph-compute-worker', 'os-network-server',
'os-block-storage-volume', 'os-ceph-image', 'os-dashboard', 'os-network-worker', 'os-ceph-block-storage-volume',
'ceph-os-block-config', 'ceph-os-compute-config', 'ceph-os-object-config', 'os-block-storage-controller', 'os-ceph-image', 'os-dashboard'
'openstack_config_mon', 'openstack_config_radosgw'
] ]
}] }]

79
conf/role/chef_ceph_openstack.conf
View File

@ -1,106 +1,77 @@
ADAPTER_NAME = 'ceph_openstack_icehouse' ADAPTER_NAME = 'ceph_openstack_icehouse'
ROLES = [{ ROLES = [{
'role': 'os-compute-worker', 'role': 'os-ceph-compute-worker',
'display_name': 'compute', 'display_name': 'compute node',
'description': 'compute node' 'description': 'compute node'
}, { }, {
'role': 'os-network', 'role': 'os-network',
'display_name': 'network', 'display_name': 'network node',
'description': 'network node including network server' 'description': 'network node including network server'
}, { }, {
'role': 'os-network-server', 'role': 'os-network-server',
'display_name': 'network server', 'display_name': 'network server node',
'description': 'network server node' 'description': 'network server node'
}, { }, {
'role': 'os-network-worker', 'role': 'os-network-worker',
'display_name': 'network worker', 'display_name': 'network node',
'description': 'network node including network server' 'description': 'network node including network server'
}, { }, {
'role': 'os-block-storage-controller', 'role': 'os-block-storage-controller',
'display_name': 'storage controller', 'display_name': 'storage controller node',
'description': 'storage controller node' 'description': 'storage controller node'
}, { }, {
'role': 'os-block-storage-volume', 'role': 'os-ceph-block-storage-volume',
'display_name': 'storage worker', 'display_name': 'storage node',
'description': 'storage node' 'description': 'storage node'
}, { }, {
'role': 'os-ceph-image', 'role': 'os-ceph-image',
'display_name': 'image', 'display_name': 'image node',
'description': 'image node for Ceph & OpenStack' 'description': 'image node'
}, { }, {
'role': 'os-compute-vncproxy', 'role': 'os-compute-vncproxy',
'display_name': 'vnc proxy', 'display_name': 'vnc proxy node',
'description': 'vnc proxy node' 'description': 'vnc proxy node'
}, {
'role': 'os-controller',
'display_name': 'controller',
'description': 'controller node including identity, dashboard, network server, and block stroage controller services'
}, { }, {
'role': 'os-compute-controller', 'role': 'os-compute-controller',
'display_name': 'controller-only', 'display_name': 'controller-only node',
'description': 'controller node for nova APIs' 'description': 'controller node for nova APIs'
}, { }, {
'role': 'os-ops-messaging', 'role': 'os-ops-messaging',
'display_name': 'message queue', 'display_name': 'message queue node',
'description': 'message queue node' 'description': 'message queue node'
}, { }, {
'role': 'os-ops-database', 'role': 'os-ops-database',
'display_name': 'database', 'display_name': 'database node',
'description': 'database node' 'description': 'database node'
}, { }, {
'role': 'os-identity', 'role': 'os-identity',
'display_name': 'keystone', 'display_name': 'keystone node',
'description': 'keystone node' 'description': 'keystone node'
}, { }, {
'role': 'os-dashboard', 'role': 'os-dashboard',
'display_name': 'dashboard', 'display_name': 'dashboard node',
'description': 'dashboard node' 'description': 'dashboard node'
}, { }, {
'role': 'os-ha', 'role': 'os-ha',
'display_name': 'ha proxy', 'display_name': 'ha proxy node',
'description': 'ha proxy node' 'description': 'ha proxy node',
}, { 'optional': True
'role': 'allinone-compute',
'display_name': 'all in one node',
'description': 'all in one compute'
}, {
'role': 'ceph-os-block-config',
'display_name': 'ceph-os block config',
'description': 'ceph os block config'
}, {
'role': 'ceph-os-compute-config',
'display_name': 'ceph-os compute config',
'description': 'ceph os compute config'
}, {
'role': 'ceph-os-object-config',
'display_name': 'ceph-os object config',
'description': 'ceph openstack object storage config'
}, { }, {
'role': 'ceph-mds', 'role': 'ceph-mds',
'display_name': 'ceph MDS', 'display_name': 'ceph metadata server',
'description': 'ceph metadata server', 'description': 'ceph metadata server',
'optional': True 'optional': True
}, { }, {
'role': 'ceph-mon', 'role': 'ceph-os-mon',
'display_name': 'ceph monitor', 'display_name': 'ceph monitor server',
'description': 'ceph monitor server' 'description': 'ceph monitor server'
}, { }, {
'role': 'ceph-osd', 'role': 'ceph-osd',
'display_name': 'ceph OSD', 'display_name': 'ceph storage server',
'description': 'ceph storage server' 'description': 'ceph storage server'
}, { }, {
'role': 'ceph-radosgw', 'role': 'ceph-os-radosgw',
'display_name': 'ceph radosgw', 'display_name': 'ceph object gateway',
'description': 'ceph object gateway', 'description': 'ceph object gateway',
'optional': True 'optional': True
}, {
'role': 'openstack_config_mon',
'display_name': 'ceph-os mon config',
'description': 'ceph openstack Monitor config',
'optional': True
}, {
'role': 'openstack_config_radosgw',
'display_name': 'ceph-os radosgw config',
'description': 'ceph openstack radosgw config',
'optional': True
}] }]

4
conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl
View File

@ -32,7 +32,7 @@
#end if #end if
#set devices = json.dumps($devices, encoding='utf-8') #set devices = json.dumps($devices, encoding='utf-8')
#set radosgw_role = $getVar('ceph_radosgw', '') #set radosgw_role = $getVar('ceph_os_radosgw', '')
#set radosgw_domain = '' #set radosgw_domain = ''
#if $radosgw_role != '' #if $radosgw_role != ''
#set radosgw_domain = $radosgw_role.hostname #set radosgw_domain = $radosgw_role.hostname
@ -46,7 +46,7 @@
#set controller_nic = $controller_role.management.interface #set controller_nic = $controller_role.management.interface
## Compute node management IP/interface ## Compute node management IP/interface
#set compute_role = $getVar('os_compute_worker', None) #set compute_role = $getVar('os_ceph_compute_worker', None)
#set compute_nic = $compute_role.management.interface #set compute_nic = $compute_role.management.interface
## Network server/worker node IP/interface ## Network server/worker node IP/interface