x/compass-core
Code Issues Proposed changes

modify conf files for ceph+openstack adapter

Browse Source 
Change-Id: I77d5c44915cd6b283a77b7c88ea0c58651f23ddb
This commit is contained in:
grace.yu 2014-10-07 17:24:19 -07:00
parent e10f00567b
commit 8cce4d6dc7
9 changed files with 70 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/flavor/chef_ceph_openstack.conf
View File

@ -5,7 +5,7 @@ FLAVORS = [
'display_name': 'Multi-node Ceph+OpenStack Cluster',
'template': 'multinodes.tmpl',
'roles': [
'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-compute-controller',
'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-ceph-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',

111
conf/package_metadata/ceph_openstack.conf
View File

@ -1,64 +1,69 @@
ADAPTER = 'ceph_openstack_icehouse'
METADATA = {
'global_config': {
'ceph_config': {
'_self': {
'required_in_whole_config': True,
'required_in_whole_config': True
},
'osd_pool_pg_num': {
'global_config': {
'_self': {
'is_required': True,
'field': 'general',
'default_value': '1024',
'mapping_to': 'osd_pool_pg_num'
}
},
'osd_pool_pgp_num': {
'_self': {
'is_required': True,
'field': 'general',
'default_value': '1024',
'mapping_to': 'osd_pool_pgp_num'
}
},
'osd_pool_size': {
'_self': {
'is_required': True,
'field': 'general',
'default_value': '3',
'mapping_to': 'osd_pool_size'
}
}
},
'osd_config': {
'_self': {
},
'journal_size': {
'_self': {
'field': 'general',
'default_value': '10000',
'mapping_to': 'journal_size'
}
},
'op_threads': {
'_self': {
'field': 'integer',
'default_value': 10,
'mapping_to': 'op_threads'
}
}
},
"osd_devices": {
'_self': {
'mapping_to': 'osd_devices'
},
'$device': {
'_self': {
'validator': is_valid_partition
'required_in_whole_config': True,
},
'journal': {
'osd_pool_pg_num': {
'_self': {
'is_required': True,
'field': 'general',
'default_value': '1024',
'mapping_to': 'osd_pool_pg_num'
}
},
'osd_pool_pgp_num': {
'_self': {
'is_required': True,
'field': 'general',
'default_value': '1024',
'mapping_to': 'osd_pool_pgp_num'
}
},
'osd_pool_size': {
'_self': {
'is_required': True,
'field': 'general',
'default_value': '3',
'mapping_to': 'osd_pool_size'
}
}
},
'osd_config': {
'_self': {
},
'journal_size': {
'_self': {
'field': 'general',
'mapping_to': 'journal'
'default_value': '10000',
'mapping_to': 'journal_size'
}
},
'op_threads': {
'_self': {
'field': 'integer',
'default_value': 10,
'mapping_to': 'op_threads'
}
}
},
"osd_devices": {
'_self': {
'mapping_to': 'osd_devices'
},
'$device': {
'_self': {
'validator': is_valid_partition
},
'journal': {
'_self': {
'field': 'general',
'mapping_to': 'journal'
}
}
}
}

6
conf/package_metadata/openstack.conf
View File

@ -10,7 +10,7 @@ METADATA = {
'key_extensions': {
'$service': ['image', 'compute', 'dashboard', 'identity', 'metering', 'rabbitmq', 'volume', 'mysql']
},
'mapping_to': 'service_credentials'
'mapping_to': 'service_credentials'
},
'$service': {
'_self': {
@ -66,7 +66,7 @@ METADATA = {
'_self': {
'required_in_whole_config': True,
'key_extensions': {
'$interface_type': ['management', 'public', 'storage', 'tenant']
'$interface_type': ['management', 'external', 'storage', 'tenant']
}
},
'$interface_type': {
@ -85,7 +85,7 @@ METADATA = {
'subnet': {
'_self': {
'is_required': False,
'field': 'general'
'field': 'general'
}
}
}

2
conf/role/chef_ceph_openstack.conf
View File

@ -32,7 +32,7 @@ ROLES = [{
'display_name': 'vnc proxy node',
'description': 'vnc proxy node'
}, {
'role': 'os-compute-controller',
'role': 'os-ceph-compute-controller',
'display_name': 'controller-only node',
'description': 'controller node for nova APIs'
}, {

40
conf/templates/chef_installer/ceph_firefly/environments/ceph_firefly.tmpl.bak
View File

@ -1,40 +0,0 @@
#import uuid
#set UUID = str(uuid.uuid4())
{
"name": "ceph_env",
"description": "",
"cookbook_versions": {
"ceph": "~> 0.2.1"
},
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
"ceph": {
"config": {
"fsid": "$UUID",
"global": {
"public network": "10.145.88.0/23",
"cluster network": "172.16.100.0/24",
"auth cluster required": "cephx",
"auth service required": "cephx",
"auth client required": "cephx",
"osd pool default pg num": "1024",
"osd pool default pgp num": "1024",
"osd pool default size": "3"
},
"mon": {
"debug mon": "20",
"debug paxos": "1/5",
"debug auth": "2"
},
"osd": {
"osd journal size": "10000",
"filestore xattr use omap": true,
"osd op threads": 10
}
}
}
},
"override_attributes": {
}
}

4
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_compute_controller', None)
#set controller_role = $getVar('os_ceph_compute_controller', None)
## Contoller node management IP/interface
#set controller_ip = $controller_role.management.ip
@ -22,7 +22,7 @@
## Network worker node management IP/interface
#set network_worker_ip = $network_worker_role.management.ip
#set network_worker_nic = $network_worker_role.management.interface
#set network_worker_public_nic = $network_worker_role.public.interface
#set network_worker_public_nic = $network_worker_role.external.interface
#set network_worker_tenant_nic = $network_worker_role.tenant.interface
## Database node 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_compute_controller', $getVar('os_controller', None))
#set controller_role = $get_role('os_ceph_compute_controller', $getVar('os_controller', None))
#set controller_ip = $controller_role.management.ip
#set controller_nic = $controller_role.management.interface
@ -60,7 +60,7 @@
## Network worker node management IP/interface
#set network_worker_ip = $network_worker_role.management.ip
#set network_worker_nic = $network_worker_role.management.interface
#set network_worker_public_nic = $network_worker_role.public.interface
#set network_worker_public_nic = $network_worker_role.external.interface
#set network_worker_tenant_nic = $network_worker_role.tenant.interface
## Database node management IP

2
conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
View File

@ -20,7 +20,7 @@
#set network_worker_ip = $network_worker_role.management.ip
#set network_worker_nic = $network_worker_role.management.interface
#set network_worker_tenant_nic = $network_worker_role.tenant.interface
#set network_worker_public_nic = $network_worker_role.public.interface
#set network_worker_public_nic = $network_worker_role.external.interface
## Database node management IP
#set db_role = $get_role('os_ops_database', $controller_role)

3
conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
View File

@ -59,6 +59,7 @@
"ntp_server": "$ntp_server",
"timezone": "$timezone",
"ignore_proxy": "$no_proxy",
"local_repo": "$getVar('local_repo', '')"
"local_repo": "$getVar('local_repo', '')",
"disk_num": 1
}
}