Ladislav Smola b6e1c9d0c3 Adding swift role back
-swift role is now separated in upstream templates,
 so adding it to scaling
-adding swift role back to initial data
-merge.py now needs all templates and it decides
 based on parameters. Otherwise it doesn't work.

Tuskar is currently broken because of this change
in tripleo templates. So this fixes broken state.

Change-Id: Icd62b94447b2d72616597d74fc8191a2d158c15c
2014-03-26 15:43:12 +01:00
..
2014-02-24 23:11:05 +00:00
2014-03-26 15:43:12 +01:00