8 Commits

Author SHA1 Message Date
Jenkins
14fa5583d9 Merge "Fix Heat Kolla demo in contrib" 2017-05-03 13:29:55 +00:00
Bertrand Lallau
9d98f80503 Fix Heat Kolla demo in contrib
Heat demo script actually use deprecated Openstack Heat client.
* script has been updated to use Openstack client.
* small log refactoring

Change-Id: I857bc1342e3b26c2bf299642ca5483b4ce78e303
2017-04-07 14:29:55 +02:00
Bertrand Lallau
4286a50113 Fix Magnum Kolla demo in contrib
Magnum demo scripts doesn't work cause compose/openstack.env
doesn't exist anymore.
* NETWORK_MANAGER check has been removed
* script has been updated to use Openstack client instead of
deprecated clients (neutron-client, glance-client).
* Magnum client calls have been adapted too.
* some enhancements (logs, variable) have been performed too.

Change-Id: I294b1876c9c7090785c0ebdd09b43843f88fb00b
Closes-Bug: #1670618
2017-03-07 10:51:02 +01:00
Jenkins
dcb102608d Merge "Fix broken test in vagrant boostrap script" 2016-11-06 06:00:37 +00:00
Martin André
193a8190ce Fix broken test in vagrant boostrap script
The file path was not properly passed to the '-x' test which caused it
to always return true.

This commit simplifies the test for existing command by relying only on
the exit code of `type` rather than checking that the file path is
executable.

Change-Id: Iaf47d92ff9fd1ef34d8d7492c08ec24d2b8a9536
Closes-Bug: #1635341
2016-10-27 18:24:50 +02:00
caoyuan
5bdf98f7b5 Update "=" to "==" in "if" condition
Keep consistent with other "if" condition
TrivialFix

Change-Id: I18fea71bd50729642543afd4d3bab0b7dfaecd3d
2016-10-22 17:04:13 +08:00
Martin André
e259c2a60d Fix vagrant's kolla folder sync
Correct relative path of kolla root directory after vagrant environment was
moved from dev/vagrant to contrib/dev/vagrant.

Closes-Bug: #1635329

Change-Id: Ib13a6123f34d69884e27029f5144ff1ad165e73e
2016-10-20 17:43:12 +02:00
Christian Berendt
b725bd09dd Move demos and dev directory into a new contrib directory
TrivialFix

Change-Id: Ifb8f19afa1514488bd288670d08b96f84982a4e1
2016-10-14 12:57:49 +02:00