x/compass-core
Code Issues Proposed changes

Support rally in docker

Browse Source 
Change-Id: If9b8ac1a4269ab750684174e092f80fb795abc38
This commit is contained in:
Xicheng Chang 2015-06-17 15:49:36 -07:00
parent 88eb8f4c9d
commit 2fb2edb35c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compass/deployment/installers/pk_installers/chef_installer/chef_installer.py
View File

@ -661,6 +661,7 @@ class ChefInstaller(PKInstaller):
rally_node_ip = rally_node['ipaddress'] rally_node_ip = rally_node['ipaddress']
command = self.config_manager.get_adapter_health_check_cmd() command = self.config_manager.get_adapter_health_check_cmd()
command = command.replace('$cluster_name', cluster_name)
option = '--url %s --clustername %s' % (callback_url, cluster_name) option = '--url %s --clustername %s' % (callback_url, cluster_name)
command = ' '.join((command, option)) command = ' '.join((command, option))

2
conf/adapter/chef_openstack.conf
View File

@ -5,4 +5,4 @@ PACKAGE_INSTALLER = 'chef_installer'
OS_INSTALLER = 'cobbler' OS_INSTALLER = 'cobbler'
SUPPORTED_OS_PATTERNS = ['(?i)centos.*', '(?i)ubuntu.*', '(?i)sles.*'] SUPPORTED_OS_PATTERNS = ['(?i)centos.*', '(?i)ubuntu.*', '(?i)sles.*']
DEPLOYABLE = True DEPLOYABLE = True
HEALTH_CHECK_COMMAND = 'python /opt/compass/health_check.py' HEALTH_CHECK_COMMAND = 'docker run -i -d $cluster_name python /opt/compass/rally/check_health.py'