6 Commits

Author SHA1 Message Date
Sean Mooney
3f0a79cee8 add template-override subdirectory to contrib and doc
- This change introduces new template-override directories
      to store container template override files.
    - template override files stored in the contirb/template-override
      directory will not be gated and serve as an
      example of how to extend in-tree container images
      for specific use cases, e.g. source build of infra
      containers.
    - templates stored in contrib/template-override should
      have corresponding documentation in doc/template-override

Change-Id: I4c76b9338f92b779cc47b3f1147a816f0b683c6c
2017-01-06 16:05:45 +00: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