x/compass-core
Code Issues Proposed changes

Merge "Modified template to support neutron configuration input" into dev/experimental

Browse Source
This commit is contained in:
Jenkins
2015-02-10 19:20:50 +00:00
committed by Gerrit Code Review
parent ae58e8e4e5 51364fe942
commit 1eed8ce893
3 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/package_field/general_list.conf Normal file
View File

@@ -0,0 +1,2 @@
NAME = 'general_list'
FIELD_TYPE = list

24
conf/package_metadata/openstack.conf
View File

@@ -80,6 +80,30 @@ METADATA = {
'options': ['gre', 'vlan'], 'options': ['gre', 'vlan'],
'default_value': 'gre' 'default_value': 'gre'
} }
},
'network_vlan_ranges': {
'_self': {
'mapping_to': 'vlan_ranges',
'is_required': False,
'field': 'general_list',
'default_value': ['physnet1:2700:2999']
}
},
'bridge_mappings': {
'_self': {
'mapping_to': 'bridge_mappings',
'is_required': False,
'field': 'general_list',
'default_value': ['physnet1:br-eth1']
}
},
'tunnel_id_ranges': {
'_self': {
'mapping_to': 'tunnel_id_ranges',
'is_required': False,
'field': 'general_list',
'default_value': ['1:1000']
}
} }
} }
}, },

18
conf/templates/chef_installer/openstack_icehouse/environments/base.tmpl
View File

@@ -58,10 +58,16 @@
## Set Openstack neutron config ## Set Openstack neutron config
#set tenant_network_type = $getDictValue('neutron_config/openvswitch/tenant_network_type', 'gre') #set tenant_network_type = $getDictValue('neutron_config/openvswitch/tenant_network_type', 'gre')
#set enable_tunneling = True #set enable_tunneling = True
#set tunnel_id_ranges = ''
#set vlan_ranges = ''
#set bridge_mappings = '' #set bridge_mappings = ''
#if $tenant_network_type != 'gre'
#if $tenant_network_type == 'vlan'
#set enable_tunneling = False #set enable_tunneling = False
#set bridge_mappings = 'physnet1:br-eth1' #set bridge_mappings = ','.join($getDictValue('neutron_config/openvswitch/bridge_mappings', ['physnet1:br-eth1']))
#set vlan_ranges = ','.join($getDictValue('neutron_config/openvswitch/vlan_ranges', ['physnet1:2700:2999']))
#else
#set tunnel_id_ranges = ','.join($getDictValue('neutron_config/openvswitch/tunnel_id_ranges', ['1:1000']))
#end if #end if
## Utility functions definition ## Utility functions definition
@@ -183,15 +189,15 @@
"ml2": { "ml2": {
"type_drivers": "$tenant_network_type", "type_drivers": "$tenant_network_type",
"tenant_network_types": "$tenant_network_type", "tenant_network_types": "$tenant_network_type",
"tunnel_id_ranges": "1:1000", "tunnel_id_ranges": "$tunnel_id_ranges",
"network_vlan_ranges": "physnet1:2700:2999", "network_vlan_ranges": "$vlan_ranges",
"enable_security_group": "True" "enable_security_group": "True"
}, },
"openvswitch": { "openvswitch": {
"tenant_network_type": "$tenant_network_type", "tenant_network_type": "$tenant_network_type",
"enable_tunneling": "$enable_tunneling", "enable_tunneling": "$enable_tunneling",
"tunnel_id_ranges": "1:1000", "tunnel_id_ranges": "$tunnel_id_ranges",
"network_vlan_ranges": "physnet1:2700:2999", "network_vlan_ranges": "$vlan_ranges",
"bridge_mappings": "$bridge_mappings", "bridge_mappings": "$bridge_mappings",
"bind_interface": "$network_worker_tenant_nic" "bind_interface": "$network_worker_tenant_nic"
}, },