From e0408bb653aaab2ea3b6244828345786bea2cb94 Mon Sep 17 00:00:00 2001 From: Yichen Wang Date: Tue, 10 Nov 2015 10:33:26 -0800 Subject: [PATCH] Fix the automated building issue for DIB Change-Id: Ibebf1c7cef23f48c472c7b09df505221d7b91307 --- doc/source/installation.rst | 4 ++-- .../elements/kloudbuster/package-installs.yaml | 1 + .../kloudbuster/post-install.d/01-kb-script | 4 ++-- .../kloudbuster/static/kb_test/kb_vm_agent.py | 13 ++++++++----- kb_server/public/ui/test.html | 9 +++++++++ kb_web/.idea/.DS_Store | Bin 6148 -> 0 bytes kb_web/app/images/.DS_Store | Bin 6148 -> 0 bytes kb_web/test/.DS_Store | Bin 6148 -> 0 bytes kb_web/test/spec/.DS_Store | Bin 6148 -> 0 bytes requirements.txt | 2 +- 10 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 kb_server/public/ui/test.html delete mode 100644 kb_web/.idea/.DS_Store delete mode 100644 kb_web/app/images/.DS_Store delete mode 100644 kb_web/test/.DS_Store delete mode 100644 kb_web/test/spec/.DS_Store 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 a1ea0a4aca4726d3c5270ef2af3f3ce1a130262b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKK~4iP478z#qDrVoj`>1=u&S09^aDT_0a9060X_7#C!WEhco8$UL9NJv3kV@w zO2%>QY<5-~$0DN3UAGXKi^vp>s8lLKb9L$@oF_oFHLm4R9^_V@Hg}bU{-TL{Ka&l1 zeS^Ip?0>OZ5B=7+tgm&ierVfn_q-N)JAc`mZ)L51=)U2#y+3>+zeh?kkPIXP$v`sj zBMcyCQ>HV=?300HAQ|{%fagO&BQ}Afqa7XStONk^8f^mI?ykT>1F#7k9bti}hXOrR zqr^}ThrNVf6F540xM&m~8c+TxUNmmbTFhOvam+p$NCu7>IQ8M2`Tr8XWVOgY4#`n6 zkPQ4Y26WP{+9h5pa_g7ZW3DY|S7;RajZ`4eEfoVT6=T42zEH<}6F53@71}Kv Pm=^&fB)eqb7Z`X4Dyc0U diff --git a/kb_web/app/images/.DS_Store b/kb_web/app/images/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0%drBP!*CO)m742!D4{FBW zf0^t)H@hbFgYM}0bsW&Ax^9n$hUoP0{a8FMaeZq4v<+Y5oKaJI?+iEt&VV!E3@pNc zUDK=kMOO1goB?Oxni!DtA)pCH!>m}24s@ji09KeT0$pkei3x_$Fe}0WVGRXpC|ila z8jks3e$g;1YB;eKA8afC6fay>NB&UUiKC+T&VVy8W#CqaYq|el@XO2=`O^>|IRnnX zKVyKadRK3;DZ5*LZBOpnfcAzaB7RvE2=vJ#00TKko{CZJL3H>lM-WWIz0{UJ~Y K@y;1ofPpj4q$ynh diff --git a/kb_web/test/spec/.DS_Store b/kb_web/test/spec/.DS_Store deleted file mode 100644 index b1504a01fc2e4508b6ade2c4bf2138bd4d0e841f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8Hu~5S>X}7}TgtxmU;y7NeZN7ciFG2@B$+SCw<+Xnyk{AVffo8}mlYyxq~f z6?%n6BO-eE9^OS-5!u5H<;TL>?7sQRUNWOVIL`Q#Nk&{3thSkP8|lHj%GZK_8*cr0 zo~CizL9C(zRDcRl0V+TRHYs4e7q)K#8L0pjpaOpi*!Q8p4Qt{Y=${S*9|3?nq}{Og zSprxr0j!C0ATlrwDln*;BZdYY`I2=taSjZ+XbvBmPu84J)Sr&?i dc~R6ATjPFBoCBSXywidF88BUFRN&DH+yQ}H7BT<; 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