x
/
compass-core
Code Issues Proposed changes

fix ubuntu log analyor pattern 

Change-Id: I8a95e3183c7944637f205d1b14e0d785e83307b0
This commit is contained in:
xiaodongwang 2014-10-14 15:51:59 -07:00
parent 610c871aaa
commit 603b7cab4e
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compass/log_analyzor/progress_calculator.py
View File

@ -111,16 +111,27 @@ OS_INSTALLER_CONFIGURATIONS = {
progress=.35,
message_template='partman-base selected',
unmatch_nextline_next_matcher_name='partman-base',
match_nextline_next_matcher_name='live-installer'
match_nextline_next_matcher_name='bootstrap-base'
),
'live-installer': LineMatcher(
'bootstrap-base': LineMatcher(
pattern=(
r'Menu.*item.*\'live-installer\'.*selected'
r'Menu.*item.*\'bootstrap-base\'.*selected'
),
progress=.40,
message_template='bootstrap-base selected',
unmatch_nextline_next_matcher_name=(
'bootstrap-base'
),
match_nextline_next_matcher_name='apt-setup-udeb'
),
'apt-setup-udeb': LineMatcher(
pattern=(
r'Menu.*item.*\'apt-setup-udeb\'.*selected'
),
progress=.45,
message_template='live-installer selected',
message_template='apt-setup-udeb selected',
unmatch_nextline_next_matcher_name=(
'live-installer'
'apt-setup-udeb'
),
match_nextline_next_matcher_name='pkgsel'
),

3
install/prepare.sh
View File

@ -210,7 +210,8 @@ ntp-4.2.6p5-1.${CENTOS_IMAGE_TYPE_OTHER}${CENTOS_IMAGE_VERSION_MAJOR}.${CENTOS_I
openssh-clients-5.3p1-94.${CENTOS_IMAGE_TYPE_OTHER}${CENTOS_IMAGE_VERSION_MAJOR}.${CENTOS_IMAGE_ARCH}.rpm
iproute-2.6.32-31.${CENTOS_IMAGE_TYPE_OTHER}${CENTOS_IMAGE_VERSION_MAJOR}.${CENTOS_IMAGE_ARCH}.rpm
wget-1.12-1.8.${CENTOS_IMAGE_TYPE_OTHER}${CENTOS_IMAGE_VERSION_MAJOR}.${CENTOS_IMAGE_ARCH}.rpm
ntpdate-4.2.6p5-1.${CENTOS_IMAGE_TYPE_OTHER}${CENTOS_IMAGE_VERSION_MAJOR}.${CENTOS_IMAGE_TYPE,,}.${CENTOS_IMAGE_ARCH}.rpm"
ntpdate-4.2.6p5-1.${CENTOS_IMAGE_TYPE_OTHER}${CENTOS_IMAGE_VERSION_MAJOR}.${CENTOS_IMAGE_TYPE,,}.${CENTOS_IMAGE_ARCH}.rpm
yum-plugin-priorities-1.1.30-14.${CENTOS_IMAGE_TYPE_OTHER}${CENTOS_IMAGE_VERSION_MAJOR}.noarch.rpm"
for f in $centos_ppa_repo_packages; do
download http://rpmfind.net/linux/${IMAGE_TYPE,,}/${IMAGE_VERSION_MAJOR}/os/${IMAGE_ARCH}/Packages/$f $f || exit $?

2
regtest/regtest.conf
View File

@ -28,7 +28,7 @@ export DEFAULT_ROLES=${DEFAULT_ROLES:-'allinone-compute'}
export NAMESERVERS=${NAMESERVERS:-$IPADDR}
export NTP_SERVER=${NTP_SERVER:-$IPADDR}
export GATEWAY=${GATEWAY:-$IPADDR}
export PROXY=${PROXY:-}
export PROXY=${PROXY:-"http://${IPADDR}:3128"}
export IGNORE_PROXY=${IGNORE_PROXY:-}
export DOMAIN=${DOMAIN:-'ods.com'}
export SEARCH_PATH=${SEARCH_PATH:-${DOMAIN}}

1
regtest/regtest10.conf
View File

@ -15,5 +15,4 @@ export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.90'}
export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.90'}
export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source ${REGTEST_DIR}/regtest.conf
export PROXY=${PROXY:-"http://${IPADDR}:3128"}
export LOCAL_REPO_URL=''

1
regtest/regtest7.conf
View File

@ -11,5 +11,4 @@ export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.82'}
export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.82'}
export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source ${REGTEST_DIR}/regtest6.conf
export PROXY=${PROXY:-"http://${IPADDR}:3128"}
export LOCAL_REPO_URL=''

1
regtest/regtest8.conf
View File

@ -11,5 +11,4 @@ export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.84'}
export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.84'}
export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source ${REGTEST_DIR}/regtest.conf
export PROXY=${PROXY:-"http://${IPADDR}:3128"}
export LOCAL_REPO_URL=''

1
regtest/regtest9.conf
View File

@ -15,5 +15,4 @@ export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.86'}
export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.86'}
export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source ${REGTEST_DIR}/regtest.conf
export PROXY=${PROXY:-"http://${IPADDR}:3128"}
export LOCAL_REPO_URL=''