Evgeniy L 03d6651ec0 Merge remote-tracking branch 'origin/master' into deployment-2 ...

Conflicts:
	example.py
	resources/mariadb_service/actions/run.yml

2015-06-03 10:41:16 +02:00

..

actions

Glance: more configs, keystone_user fix

2015-05-29 18:07:38 +02:00

templates

Glance: more configs, keystone_user fix

2015-05-29 18:07:38 +02:00

meta.yaml

Working mariadb -> keystone -> haproxy connections

2015-06-02 14:23:47 +02:00