5 Commits

Author SHA1 Message Date
Jenkins
6d40d52dcd Merge "Make sahara api worker configurable" 2016-10-10 19:31:09 +00:00
liyingjun
9de0894fbd Make sahara api worker configurable
Sahara api workers is hard-coded to 2 [1], it should be configurable as
other services do.

[1]:
https://github.com/openstack/kolla/blob/master/ansible/roles/sahara/templates/sahara.conf.j2#L9

Change-Id: Iefb487275c4e0d02f58a198e3995ca096f5e9218
Closes-bug: 1631835
2016-10-10 12:06:22 +08:00
liyingjun
d1b95be49a Use rootwrap in sahara config
In cases where a proxy command is being used to access cluster
instances, rootwrap is needed for sahara user in docker container.

http://docs.openstack.org/developer/sahara/userdoc/advanced.configuration.guide.html#non-root-users

TrivialFix

Change-Id: Ic2b7deb6bd0e5f740944c32d89390fb56b88f4fa
2016-10-10 10:53:26 +08:00
liyingjun
e31dede2b0 Fix generated sahara conf
There should be a blank line between 'transport_url' and 'use_neutron = True',
otherwise these line will be merge into one line after rendering.

TrivialFix

Change-Id: I66d14d5bc4b03b450cdcc0f7ac80548ed90bcd2d
2016-09-10 10:12:42 +08:00
zhubingbing
0c9debe893 Add sahara ansible role
Change-Id: I75b58248bfc4e86cace75faa82526d55a9ebbdbf
Partially-Implements: blueprint sahara-role
2016-09-07 15:29:02 +00:00