x/compass-core
Code Issues Proposed changes

modify conf files for cpeh+openstack

Browse Source 
Change-Id: Iae0def41d317f07ccdf98c7fec105d3f0ff369f9
This commit is contained in:
grace.yu 2014-10-08 11:40:44 -07:00
parent 8cce4d6dc7
commit 3327480a8f
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
conf/flavor/chef_ceph_openstack.conf
View File

@ -5,10 +5,17 @@ FLAVORS = [
'display_name': 'Multi-node Ceph+OpenStack Cluster',
'template': 'multinodes.tmpl',
'roles': [
'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-ceph-compute-controller',
'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-compute-controller',
'ceph-os-mon', 'ceph-osd', 'ceph-mds', 'ceph-os-radosgw',
'os-ceph-compute-worker', 'os-network-server',
'os-network-worker', 'os-ceph-block-storage-volume',
'os-block-storage-controller', 'os-ceph-image', 'os-dashboard'
'os-network-worker', 'os-block-storage-volume',
'os-ceph-block-storage-controller', 'os-ceph-image', 'os-dashboard'
]
}, {
'flavor': 'ceph_openstack_single_controller',
'display_name': 'Single controller Ceph+OpenStack Cluster',
'template': 'multinodes.tmpl',
'roles': [
'os-ceph-controller', 'ceph-os-mon', 'ceph-osd', 'ceph-mds', 'ceph-os-radosgw',
'os-ceph-compute-worker', 'os-network-worker'
}]

10
conf/role/chef_ceph_openstack.conf
View File

@ -16,11 +16,11 @@ ROLES = [{
'display_name': 'network node',
'description': 'network node including network server'
}, {
'role': 'os-block-storage-controller',
'role': 'os-ceph-block-storage-controller',
'display_name': 'storage controller node',
'description': 'storage controller node'
}, {
'role': 'os-ceph-block-storage-volume',
'role': 'os-block-storage-volume',
'display_name': 'storage node',
'description': 'storage node'
}, {
@ -32,10 +32,14 @@ ROLES = [{
'display_name': 'vnc proxy node',
'description': 'vnc proxy node'
}, {
'role': 'os-ceph-compute-controller',
'role': 'os-compute-controller',
'display_name': 'controller-only node',
'description': 'controller node for nova APIs'
}, {
'role': 'os-ceph-controller',
'display_name': 'controller node',
'description': 'controller node for nova APIs'
},{
'role': 'os-ops-messaging',
'display_name': 'message queue node',
'description': 'message queue node'

2
conf/templates/chef_installer/ceph_openstack_icehouse/environments/ha_multinodes.tmpl
View File

@ -2,7 +2,7 @@
#set ha_proxy_role = $getVar('os_ha', None)
#set ha_proxy_nic = $ha_proxy_role.management.interface
#set controller_role = $getVar('os_ceph_compute_controller', None)
#set controller_role = $get_role('os_compute_controller', $getVar('os_ceph_controller', None))
## Contoller node management IP/interface
#set controller_ip = $controller_role.management.ip

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

@ -41,7 +41,7 @@
## OpenStack config
## Contoller node management IP/interface
#set controller_role = $get_role('os_ceph_compute_controller', $getVar('os_controller', None))
#set controller_role = $get_role('os_compute_controller', $getVar('os_ceph_controller', None))
#set controller_ip = $controller_role.management.ip
#set controller_nic = $controller_role.management.interface
@ -83,7 +83,7 @@
#set glance_nic = $glance_role.management.interface
## Cinder node management IP/interface
#set cinder_role = $get_role('os_block_storage_controller', $controller_role)
#set cinder_role = $get_role('os_ceph_block_storage_controller', $controller_role)
#set cinder_controller_ip = $cinder_role.management.ip
#set cinder_controller_nic = $cinder_role.management.interface