diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 25dc3ee..d03e088 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -20,13 +20,13 @@ Ubuntu/Debian based:
.. 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:
.. 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:
diff --git a/kb_dib/elements/kloudbuster/package-installs.yaml b/kb_dib/elements/kloudbuster/package-installs.yaml
index 12acb3f..ca7b522 100644
--- a/kb_dib/elements/kloudbuster/package-installs.yaml
+++ b/kb_dib/elements/kloudbuster/package-installs.yaml
@@ -3,6 +3,7 @@ cmake:
git:
iperf:
libssl-dev:
+libyaml-dev:
nginx:
nodejs:
nodejs-legacy:
diff --git a/kb_dib/elements/kloudbuster/post-install.d/01-kb-script b/kb_dib/elements/kloudbuster/post-install.d/01-kb-script
index cef7d64..f3a86aa 100755
--- a/kb_dib/elements/kloudbuster/post-install.d/01-kb-script
+++ b/kb_dib/elements/kloudbuster/post-install.d/01-kb-script
@@ -91,13 +91,13 @@ npm install
bower install --allow-root --config.interactive=false --force
grunt build
rm -rf ../kb_server/public/ui/*
+mkdir -p ../kb_server/public/ui
mv dist/* ../kb_server/public/ui
# =======
# Cleanup
# =======
-
# Remove HdrHistogram_c and wrk2 builds
rm -rf /tmp/HdrHistogram_c
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
# 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-dev
apt-get -y --purge remove build-essential
diff --git a/kb_dib/elements/kloudbuster/static/kb_test/kb_vm_agent.py b/kb_dib/elements/kloudbuster/static/kb_test/kb_vm_agent.py
index ba6f9e4..b0dc0ab 100644
--- a/kb_dib/elements/kloudbuster/static/kb_test/kb_vm_agent.py
+++ b/kb_dib/elements/kloudbuster/static/kb_test/kb_vm_agent.py
@@ -44,8 +44,8 @@ def get_image_name():
def get_image_version():
return __version__
-def exec_command(cmd):
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+def exec_command(cmd, cwd=None):
+ p = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdout, stderr) = p.communicate()
return p.returncode
@@ -293,9 +293,12 @@ if __name__ == "__main__":
user_data = dict(eval(f.read()))
except Exception as e:
# KloudBuster starts without user-data
- config_file = 'kloudbuster/kb_server/config.py'
- cmd = ['pecan', 'serve', config_file]
- sys.exit(exec_command(cmd))
+ cwd = 'kloudbuster/kb_server'
+ cmd = ['python', 'config.py', 'develop']
+ 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':
agent = KBA_Proxy()
diff --git a/kb_server/public/ui/test.html b/kb_server/public/ui/test.html
new file mode 100644
index 0000000..c2ddcc1
--- /dev/null
+++ b/kb_server/public/ui/test.html
@@ -0,0 +1,9 @@
+
+
+
+Test
+
+
+Test
+
+
diff --git a/kb_web/.idea/.DS_Store b/kb_web/.idea/.DS_Store
deleted file mode 100644
index a1ea0a4..0000000
Binary files a/kb_web/.idea/.DS_Store and /dev/null differ
diff --git a/kb_web/app/images/.DS_Store b/kb_web/app/images/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/kb_web/app/images/.DS_Store and /dev/null differ
diff --git a/kb_web/test/.DS_Store b/kb_web/test/.DS_Store
deleted file mode 100644
index 83c9144..0000000
Binary files a/kb_web/test/.DS_Store and /dev/null differ
diff --git a/kb_web/test/spec/.DS_Store b/kb_web/test/spec/.DS_Store
deleted file mode 100644
index b1504a0..0000000
Binary files a/kb_web/test/spec/.DS_Store and /dev/null differ
diff --git a/requirements.txt b/requirements.txt
index 7fbd5a2..f799813 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,11 +5,11 @@
pbr>=1.3
Babel>=1.3
+python-openstackclient>=1.5.0
attrdict>=2.0.0
hdrhistogram>=0.3.1
oslo.log>=1.0.0
pecan>=0.9.0
-python-openstackclient>=1.5.0
redis>=2.10.3
tabulate>=0.7.3