19 Commits

Author SHA1 Message Date
Eduardo Gonzalez
775d8019b6 Add custom policies in service.json
Include custom policy.json files in service-api.json.j2 files

Change-Id: Ic55bfc6f61131aa72c3497ce8b2282056bcc7f92
Partially-Implements: blueprint custom-policies
2016-12-02 16:22:17 +00:00
Duong Ha-Quang
b5d1e4b457 Fix placement of policy.json
Currently, policy.json is put in
"{{ node_config_directory }}/{{ service_name }}"
in target nodes.

Relocation policy.json to "{{ node_config_directory }}/{{ item }}"
with item is corresponding service compoment config directory.

Currently, the policy.json is copied to all services, but it
should be reviewed and left only in neccesary service
(at many cases, only API service needs that).

Redundant files will be removed in follow up patchset.

Change-Id: I0e997dccf4ec438c9c0436db71ec2fd06650f50d
Closes-Bug: #1639686
2016-11-29 16:00:09 +07:00
Jenkins
dbc881456b Merge "Custom policy files" 2016-11-04 13:42:55 +00:00
Jeffrey Zhang
fa45801946 Move precheck into its own role
* Merge prechecks.yml and site.yml playbook
* Create empty precheck.yml into all roles.

Change-Id: I8a138558a26c0a2a66c5fd48ed37be657c99c1dd
Implements: blueprint condition-pre-check
2016-11-03 14:48:58 +08:00
Eduardo Gonzalez
ef1fd6b8c0 Custom policy files
Allow operators to use their custom policy files.
Avoid maintain policy files in kolla repos, only copying
the files when an operator add their custom config.

Implements: blueprint custom-policies
Change-Id: Icf3c961b87cbc7a1f1dd2ffbfffcf271d151d862
2016-10-28 10:47:05 +01:00
Martin André
0e6c0abcd1 Fix syntax error in sahara permissions
Key was missing an ending double quote.

Change-Id: Ia11e3f7484c1937cd11a01410dcbee213e994338
Related-Bug: #1631503
2016-10-18 08:26:12 +02:00
zhubingbing
cab32bc727
Fix sahara upgrade permission issue
Change-Id: If7d28829a4c134c655e1b08df1d3ceb7e1989f3c
Partial-Bug: #1631503
2016-10-17 09:26:48 +08:00
Jenkins
45b0f2cf63 Merge "Remove do_reconfigure.yml file for all roles" 2016-10-13 16:20:30 +00:00
Jenkins
2abef796d6 Merge "Mount host localtime for containers" 2016-10-13 14:06:20 +00:00
Jeffrey Zhang
16a1f9f006 Mount host localtime for containers
Add /etc/localtime:/etc/localtime:ro to volume for aodh, barbican, etcd,
gnocchi, kuryr and sahara.
All the containers are added in Netwon cycle, so no need to backport

Closes-Bug: #1633049
Change-Id: I9cdba54cf730af44fb1a9ff6f2c936d23dadbe9a
2016-10-13 11:35:03 +00:00
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
Eduardo Gonzalez
7370e01b4a Fix sahara endpoint url
Sahara endpoint need api version and tenant_id
in the URL, otherwise will fail with an incorrect
path/resource could not be found.

Change-Id: I348919b8ff1d00a1f6ce782f07ce2354201bac8b
Closes-Bug: #1629895
2016-10-03 18:34:37 +02:00
Jeffrey Zhang
fa856556d5 Remove do_reconfigure.yml file for all roles
do_reconfigure.yml is introduced to use serial directive. But we use
it in wrong. Now serial has moved to playbook file. So it is time to
remove the do_reconfigure.yml file

Closes-Bug: #1628152
Change-Id: I8d42d27e6bc302a0e575b0353956eaef9b2ca9fd
2016-09-27 15:04:00 +00:00
zhubingbing
44bcd66312 Add upgrade.yml to sahara
Closes-bug: #1626555

Change-Id: Ie78835a74965538ba2141a80641384116ef5078c
2016-09-23 03:57:01 +00:00
Mick Thompson
4c1482b999 Added serial option to site.yml.
Useful for upgrade etc., which is preferablly done serially.

Example usage: tools/kolla-ansible deploy OR tools/kolla-ansible upgrade

Closes-Bug: #1576708

DocImpact

Change-Id: I34b2e16f8ce53e472a4682a4738c4ac0f5abf00c
2016-09-13 09:26:51 +00: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