x/kloudbuster
Code Issues Proposed changes

Fix the automated building issue for DIB

Browse Source 
Change-Id: Ibebf1c7cef23f48c472c7b09df505221d7b91307
This commit is contained in:
Yichen Wang 2015-11-10 10:33:26 -08:00
parent e4bab5c222
commit e0408bb653
10 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/installation.rst
View File

@ -20,13 +20,13 @@ Ubuntu/Debian based:
.. code-block:: bash .. code-block:: bash
$ sudo apt-get install python-dev python-pip python-virtualenv $ sudo apt-get install python-dev python-pip python-virtualenv libyaml-dev
RHEL/Fedora/CentOS based: RHEL/Fedora/CentOS based:
.. code-block:: bash .. code-block:: bash
$ sudo yum install gcc python-devel python-pip python-virtualenv $ sudo yum install gcc python-devel python-pip python-virtualenv libyaml-devel
MacOSX: MacOSX:

1
kb_dib/elements/kloudbuster/package-installs.yaml
View File

@ -3,6 +3,7 @@ cmake:
git: git:
iperf: iperf:
libssl-dev: libssl-dev:
libyaml-dev:
nginx: nginx:
nodejs: nodejs:
nodejs-legacy: nodejs-legacy:

4
kb_dib/elements/kloudbuster/post-install.d/01-kb-script
View File

@ -91,13 +91,13 @@ npm install
bower install --allow-root --config.interactive=false --force bower install --allow-root --config.interactive=false --force
grunt build grunt build
rm -rf ../kb_server/public/ui/* rm -rf ../kb_server/public/ui/*
mkdir -p ../kb_server/public/ui
mv dist/* ../kb_server/public/ui mv dist/* ../kb_server/public/ui
# ======= # =======
# Cleanup # Cleanup
# ======= # =======
# Remove HdrHistogram_c and wrk2 builds # Remove HdrHistogram_c and wrk2 builds
rm -rf /tmp/HdrHistogram_c rm -rf /tmp/HdrHistogram_c
rm -rf /tmp/wrk2 rm -rf /tmp/wrk2
@ -108,7 +108,7 @@ rm -rf /kb_test/kloudbuster/kb_web/bower_components
rm -rf /kb_test/kloudbuster/kb_web/.tmp rm -rf /kb_test/kloudbuster/kb_web/.tmp
# Uninstall unneeded packages # Uninstall unneeded packages
apt-get -y --purge remove git apt-get -y --purge remove libyaml-dev
apt-get -y --purge remove python-pip apt-get -y --purge remove python-pip
apt-get -y --purge remove python-dev apt-get -y --purge remove python-dev
apt-get -y --purge remove build-essential apt-get -y --purge remove build-essential

13
kb_dib/elements/kloudbuster/static/kb_test/kb_vm_agent.py
View File

@ -44,8 +44,8 @@ def get_image_name():
def get_image_version(): def get_image_version():
return __version__ return __version__
def exec_command(cmd): def exec_command(cmd, cwd=None):
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdout, stderr) = p.communicate() (stdout, stderr) = p.communicate()
return p.returncode return p.returncode
@ -293,9 +293,12 @@ if __name__ == "__main__":
user_data = dict(eval(f.read())) user_data = dict(eval(f.read()))
except Exception as e: except Exception as e:
# KloudBuster starts without user-data # KloudBuster starts without user-data
config_file = 'kloudbuster/kb_server/config.py' cwd = 'kloudbuster/kb_server'
cmd = ['pecan', 'serve', config_file] cmd = ['python', 'config.py', 'develop']
sys.exit(exec_command(cmd)) rc = exec_command(cmd, cwd=cwd)
if not rc:
cmd = ['pecan', 'serve', 'config.py']
sys.exit(exec_command(cmd, cwd=cwd))
if user_data.get('role') == 'KB-PROXY': if user_data.get('role') == 'KB-PROXY':
agent = KBA_Proxy() agent = KBA_Proxy()

9
kb_server/public/ui/test.html Normal file
View File

@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<title>Test</title>
</head>
<body>
<p>Test</p>
</body>
</html>

BIN
kb_web/.idea/.DS_Store generated vendored
View File

Binary file not shown.

BIN
kb_web/app/images/.DS_Store vendored
View File

Binary file not shown.

BIN
kb_web/test/.DS_Store vendored
View File

Binary file not shown.

BIN
kb_web/test/spec/.DS_Store vendored
View File

Binary file not shown.

2
requirements.txt
View File

@ -5,11 +5,11 @@
pbr>=1.3 pbr>=1.3
Babel>=1.3 Babel>=1.3
python-openstackclient>=1.5.0
attrdict>=2.0.0 attrdict>=2.0.0
hdrhistogram>=0.3.1 hdrhistogram>=0.3.1
oslo.log>=1.0.0 oslo.log>=1.0.0
pecan>=0.9.0 pecan>=0.9.0
python-openstackclient>=1.5.0
redis>=2.10.3 redis>=2.10.3
tabulate>=0.7.3 tabulate>=0.7.3