x/compass-core
Code Issues Proposed changes

fix typo in regtest.sh

Browse Source 
Change-Id: If6758764b52c53b09ca3094a386a174e7ba38be4
This commit is contained in:
xiaodongwang 2014-04-03 10:27:06 -07:00
parent 74f1bc08a4
commit 8e56d2393d
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compass/config_management/utils/config_manager.py
View File

@ -100,7 +100,8 @@ CLUSTER_HOST_MERGER = ConfigMerger(
path_list=['/networking/global'], path_list=['/networking/global'],
from_upper_keys={'default': 'default_no_proxy', from_upper_keys={'default': 'default_no_proxy',
'clusterid': '/clusterid', 'clusterid': '/clusterid',
'noproxy_pattern': 'noproxy_pattern'}, 'noproxy_pattern': 'noproxy_pattern',
'ha_vip': 'ha_vip'},
from_lower_keys={'hostnames': '/hostname', from_lower_keys={'hostnames': '/hostname',
'ips': '/networking/interfaces/management/ip'}, 'ips': '/networking/interfaces/management/ip'},
to_key='ignore_proxy', to_key='ignore_proxy',

6
compass/config_management/utils/config_merger_callbacks.py
View File

@ -501,9 +501,13 @@ def assign_from_pattern(_upper_ref, _from_key, lower_refs, to_key,
def assign_noproxy(_upper_ref, _from_key, lower_refs, def assign_noproxy(_upper_ref, _from_key, lower_refs,
to_key, default=[], clusterid=None, to_key, default=[], clusterid=None,
noproxy_pattern='', noproxy_pattern='',
hostnames={}, ips={}, **_kwargs): hostnames={}, ips={}, **kwargs):
"""Assign no proxy to hosts.""" """Assign no proxy to hosts."""
no_proxy_list = copy.deepcopy(default) no_proxy_list = copy.deepcopy(default)
for _, value in kwargs.items():
if value:
no_proxy_list.append(value)
if not clusterid: if not clusterid:
raise KeyError( raise KeyError(
'clusterid %s is empty' % clusterid) 'clusterid %s is empty' % clusterid)

6
regtest/regtest.conf
View File

@ -38,9 +38,9 @@ export SEARCH_PATH=${SEARCH_PATH:-'ods.com'}
export HA_VIP=${HA_VIP:-''} export HA_VIP=${HA_VIP:-''}
export NETWORKING=${NETWORKING:-"nameservers=$NAMESERVERS;search_path=$SEARCH_PATH;gateway=$GATEWAY;proxy=$PROXY;ntp_server=$NTP_SERVER;ha_vip=$HA_VIP;management_ip_start=$MANAGEMENT_IP_START;management_ip_end=$MANAGEMENT_IP_END;management_netmask=$MANAGEMENT_NETMASK;management_gateway=;management_nic=$MANAGEMENT_NIC;management_promisc=$MANAGEMENT_PROMISC;tenant_ip_start=$TENANT_IP_START;tenant_ip_end=$TENANT_IP_END;tenant_netmask=$TENANT_NETMASK;tenant_gateway=;tenant_nic=$TENANT_NIC;tenant_promisc=$TENANT_PROMISC;public_ip_start=$PUBLIC_IP_START;public_ip_end=$PUBLIC_IP_END;public_netmask=$PUBLIC_NETMASK;public_gateway=;public_nic=$PUBLIC_NIC;public_promisc=$PUBLIC_PROMISC;storage_ip_start=$STORAGE_IP_START;storage_ip_end=$STORAGE_IP_END;storage_netmask=$STORAGE_NETMASK;storage_gateway=;storage_nic=$STORAGE_NIC;storage_promisc=$STORAGE_PROMISC"} export NETWORKING=${NETWORKING:-"nameservers=$NAMESERVERS;search_path=$SEARCH_PATH;gateway=$GATEWAY;proxy=$PROXY;ntp_server=$NTP_SERVER;ha_vip=$HA_VIP;management_ip_start=$MANAGEMENT_IP_START;management_ip_end=$MANAGEMENT_IP_END;management_netmask=$MANAGEMENT_NETMASK;management_gateway=;management_nic=$MANAGEMENT_NIC;management_promisc=$MANAGEMENT_PROMISC;tenant_ip_start=$TENANT_IP_START;tenant_ip_end=$TENANT_IP_END;tenant_netmask=$TENANT_NETMASK;tenant_gateway=;tenant_nic=$TENANT_NIC;tenant_promisc=$TENANT_PROMISC;public_ip_start=$PUBLIC_IP_START;public_ip_end=$PUBLIC_IP_END;public_netmask=$PUBLIC_NETMASK;public_gateway=;public_nic=$PUBLIC_NIC;public_promisc=$PUBLIC_PROMISC;storage_ip_start=$STORAGE_IP_START;storage_ip_end=$STORAGE_IP_END;storage_netmask=$STORAGE_NETMASK;storage_gateway=;storage_nic=$STORAGE_NIC;storage_promisc=$STORAGE_PROMISC"}
export HOME_PERCENTAGE=${HOME_PERCENTAGE:-'40'} export HOME_PERCENTAGE=${HOME_PERCENTAGE:-'5'}
export TMP_PERCENTAGE=${TMP_PERCENTAGE:-'10'} export TMP_PERCENTAGE=${TMP_PERCENTAGE:-'5'}
export VAR_PERCENTAGE=${VAR_PERCENTAGE:-'15'} export VAR_PERCENTAGE=${VAR_PERCENTAGE:-'10'}
export PARTITION=${PARTITION:-"home:percentage=${HOME_PERCENTAGE},tmp:percentage=${TMP_PERCENTAGE},var:percentage=${VAR_PERCENTAGE}"} export PARTITION=${PARTITION:-"home:percentage=${HOME_PERCENTAGE},tmp:percentage=${TMP_PERCENTAGE},var:percentage=${VAR_PERCENTAGE}"}
export SERVER_USERNAME=${SERVER_USERNAME:-root} export SERVER_USERNAME=${SERVER_USERNAME:-root}

4
regtest/regtest.sh
View File

@ -104,7 +104,7 @@ for i in `seq $VIRT_NUM`; do
if [ -z "$machines" ]; then if [ -z "$machines" ]; then
machines="${mac}" machines="${mac}"
else else
machines="${machines,${mac}" machines="${machines},${mac}"
fi fi
if [ $roles_offset -lt ${#roles_list[@]} ]; then if [ $roles_offset -lt ${#roles_list[@]} ]; then
@ -114,7 +114,7 @@ for i in `seq $VIRT_NUM`; do
host_roles="host${i}=" host_roles="host${i}="
fi fi
if [ -z "$host_roles_list" ]l then if [ -z "$host_roles_list" ]; then
host_roles_list="$host_roles" host_roles_list="$host_roles"
else else
host_roles_list="${host_roles_list};$host_roles" host_roles_list="${host_roles_list};$host_roles"