diff --git a/compass/actions/health_check/check_os_installer.py b/compass/actions/health_check/check_os_installer.py index 6ededde3..dac58423 100644 --- a/compass/actions/health_check/check_os_installer.py +++ b/compass/actions/health_check/check_os_installer.py @@ -37,6 +37,10 @@ class OsInstallerCheck(base.BaseCheck): return (self.code, self.messages) check_result = self.remote.check(self.token) + + for index, message in enumerate(check_result): + if "SELinux" in message: + check_result.pop(index) if len(check_result) != 0: self.code = 0 for error_msg in check_result: diff --git a/install/compass.sh b/install/compass.sh index ac8a1a0d..c1106d2a 100755 --- a/install/compass.sh +++ b/install/compass.sh @@ -31,11 +31,9 @@ cd $SCRIPT_DIR ##SUBNET=${SUBNET:-$(ip address| grep "global $NIC" |cut -f 6 -d ' ')} WEB_HOME=${WEB_HOME:-'/tmp/web/'} ADAPTER_HOME=${ADAPTER_HOME:-'/tmp/adapter/'} -## copygit2dir $WEB_HOME 'https://github.com/huawei-cloud/compass-web' -## copygit2dir $ADAPTER_HOME 'https://github.com/huawei-cloud/compass-adapters' WEB_SOURCE=${WEB_SOURCE:-'https://github.com/stackforge/compass-web'} -ADPATER_SOURCE=${ADAPTER_SOURCE:-'https://github.com/stackforge/compass-adapters'} -if [ $source != local ]; then +ADAPTER_SOURCE=${ADAPTER_SOURCE:-'https://github.com/stackforge/compass-adapters'} +if [ "$source" != "local" ]; then copygit2dir $WEB_HOME $WEB_SOURCE copygit2dir $ADAPTER_HOME $ADAPTER_SOURCE else @@ -117,6 +115,8 @@ sudo \cp -rf $WEB_HOME/public/* /var/www/compass_web/ sudo chmod +x /etc/init.d/compassd sudo chmod +x /usr/bin/compassd +sudo chkconfig compassd on + sudo chmod +x /opt/compass/bin/addcookbooks.py sudo chmod +x /opt/compass/bin/adddatabags.py sudo chmod +x /opt/compass/bin/addroles.py