openstack/kolla-ansible
Code Issues Proposed changes
6,010 Commits 5 Branches 115 Tags
6d7c24d4f7
Commit Graph

6010 Commits

Author SHA1 Message Date
Jenkins
6d7c24d4f7 Merge "Enable mistral dashboard when enable_mistral is yes" 2016-12-12 13:57:10 +00:00
Jenkins
43238935eb Merge "Add enable_cinder_backend_nfs option example" 2016-12-12 12:25:42 +00:00
Jenkins
b713096a18 Merge "Change Dockerfile to ansible role in the release note." 2016-12-12 12:25:23 +00:00
Andrew Widdersheim
2c9cf12cb9 Add enable_cinder_backend_nfs option example 
TrivialFix

Change-Id: I7a451d247f643c668d62c77da36dd1c7e66a9183
(cherry picked from commit 5833cd6be19ee96ce4cc11c9c9b9f728c4cd3b6c)
 2016-12-12 16:29:51 +08:00
caowei
6ef0322244 Change Dockerfile to ansible role in the release note. 
Change-Id: Id979b1939298c6451b79af6a331736038a5c317f
 2016-12-11 20:42:29 +08:00
caoyuan
b3ab37d0c8 Enable mistral dashboard when enable_mistral is yes 
Depends-On: I37c73e6304ed005fe019dcdd105c1f333137fa60

Change-Id: I544810afaa5c740f67702ba34e146c19b480de8d
Closes-Bug: #1647267
 2016-12-10 14:14:21 +00:00
caoyuan
f301bba26c Enable watcher dashboard when enable_watcher is yes 
Depends-On: Ief5898f6bf1caa3a7fe6b2a96be2bdb79e402f28

Change-Id: I2ea4bd9308637056c6cb1b1d515efd1020a60d1b
Closes-Bug: #1647162
 2016-12-10 14:13:48 +00:00
Jenkins
8bd87dcc1e Merge "Always check enable_* variables first" 2016-12-10 03:01:35 +00:00
Jenkins
466b8670d1 Merge "Fix can't generate heka-custom.toml on multi-nodes" 2016-12-09 19:47:18 +00:00
Jenkins
4e16f8066f Merge "Read EXTRA_OPTS from env in kolla-ansible script" 2016-12-09 19:45:14 +00:00
Jenkins
83fc59fbbc Merge "Swift data transfer should not be using the API Network" 2016-12-09 19:45:01 +00:00
Jenkins
67ae89dec7 Merge "Fix neutron-vpnaas for redhat derived bases" 2016-12-09 19:44:46 +00:00
Jenkins
12c54c408f Merge "Change 'docker' to 'Docker' in docs" 2016-12-09 11:50:40 +00:00
Jenkins
e725268a51 Merge "Add missing per service Keystone config augments" 2016-12-09 11:50:34 +00:00
Jenkins
e7cdf3cc80 Merge "Add *.egg-info into .gitignore file" 2016-12-09 11:36:55 +00:00
Jenkins
f65c0ee806 Merge "Sometimes merging of passwords.yml gives json" 2016-12-08 16:18:44 +00:00
Steve Wilkerson
5bfae58176 Change 'docker' to 'Docker' in docs 
Changed occurences of 'docker' to 'Docker' to be in accordance
with Docker Inc's trademark guidelines found here:

https://www.docker.com/trademark-guidelines

This was done due to a pending change that will append Docker
Inc's trademark notice in the kolla docs

TrivialFix

Change-Id: Ie3f385897bfa604986bd99329c0f4b961d3c8552
 2016-12-08 08:07:12 -06:00
Ethan Lynn
e237319965 Always check enable_* variables first 
Check enable_* variables first, then check inventory_host in
group, will help to avoid configuration errors.

Change-Id: Icdb1f50e5c911203b92ac431723620756b15f3c6
Closes-Bug: #1648376
 2016-12-08 17:59:48 +08:00
jackning
4396cae2b8 Fix can't generate heka-custom.toml on multi-nodes 
Original we judge heka-custom.toml whether exists with stat: path=
method, but if deploy on multi-nodes, should add local_action.

Change-Id: Id4a124499d1db03b16cb8af231a394b53fe44cbf
Closes-Bug: #1646732
 2016-12-08 17:50:17 +08:00
Ethan Lynn
282afeafa3 Become root when executing task "Set firewall default policy" 
Add missing "become: True"

Change-Id: I22b9a44fa3e5d147f487e2e24f3f0a65484951ff
Closes-Bug: #1648370
 2016-12-08 17:31:15 +08:00
Jenkins
347a86dbaa Merge "Enable searchlight ui when searchlight enabled" 2016-12-08 09:00:08 +00:00
Ethan Lynn
48fc6b7e4c Add monitoring group as a children of baremetal group 
Add monitoring group as a children of baremetal group in
multinode inventory.

Change-Id: Id4b1239a347637e30759a8e29816aa8f24e5cd53
Closes-Bug: #1648311
 2016-12-08 14:38:52 +08:00
Jenkins
628418f3ea Merge "Enable designate dashboard when enable_designate is yes" 2016-12-07 12:35:06 +00:00
James McCarthy
66e17f6a4b Swift data transfer should not be using the API Network 
The account, container, and object templates were incorrectly
using the api_interface as their bind_ip configuration setting.

Updated these templates to instead use the storage_interface.

Change-Id: I683102096cd6aa3c77a7900f5a1a248cdcddba42
Note: Rings must be generated accordingly.
 2016-12-06 21:05:55 +00:00
Jeffrey Zhang
8e46c7d985 Add name for tacker playbook 
Change-Id: I5c9fc09097e061aef55dc92606be159b8bfa357e
 2016-12-07 00:30:14 +08:00
Jenkins
09a0319a92 Merge "Give plays in the playbooks a name" 2016-12-06 15:43:46 +00:00
Jenkins
2ec6e07d6d Merge "Remove store_events parameter from ceilometer configuration" 2016-12-06 13:28:14 +00:00
Jenkins
2e25a49f9d Merge "Revert "Enable zaqar ui when zaqar enabled"" 2016-12-06 13:05:50 +00:00
Jenkins
c93cc27643 Merge "Tacker NFV Ansible support" 2016-12-06 13:04:01 +00:00
Jeffrey Zhang
ba173ceb10 Revert "Enable zaqar ui when zaqar enabled" 
This reverts commit 9fc5157cc7172eea6cd875692a44e13cab1b8226.

zaqar role is not implemented and there is no enable_zaqar variable,
too.

Change-Id: If40fdf8d672ee5e0b375513364734f245fa1d682
 2016-12-06 20:14:39 +08:00
liyingjun
ad3085bffd Enable searchlight ui when searchlight enabled 
Depends-On: Ie65c374dd319e38fe50fc3dca15c64d07edc8e1a
Change-Id: I9867f1b96b732b473fe043ab57e3338582f7dd9a
Closes-bug: #1646690
 2016-12-06 19:05:59 +08:00
Christian Berendt
ad7157ea94 Remove store_events parameter from ceilometer configuration 
The store_events parameter was removed from ceilometer collector
service with https://review.openstack.org/#/c/367982

Change-Id: If08c280949a2ef5274cc8b029750f98d6f6af79b
Closes-bug: #1647585
 2016-12-06 10:18:56 +00:00
Jenkins
7f3c9b0912 Merge "Enable senlin dashboard when enable_senlin is yes" 2016-12-06 10:08:05 +00:00
Jenkins
84780a0145 Merge "Follow Docker Inc's trademark guidelines" 2016-12-06 07:55:13 +00:00
jianyi
5cb2ec8ee9 Enable senlin dashboard when enable_senlin is yes 
Depends-On: I27ac67f42ad04ac5cf6d18b6f56506949aa4887c
Change-Id: I42c8cc7a750d1fd0c4e6ca491ef13d14c968d67b
Closes-Bug: #1646023
 2016-12-06 13:58:12 +08:00
Steven Dake
e64f3f5753 Follow Docker Inc's trademark guidelines 
Reference:

    https://www.docker.com/trademark-guidelines

Change-Id: Id9cdc9d036339727834179162cc7dc128c11593b
Depends-On: I6cab23f190312354cb6dcc9b1741bc4edb67a98d
 2016-12-05 21:54:52 -07:00
Jeffrey Zhang
fa17913ebf Add *.egg-info into .gitignore file 
After repo split, the egg info changed from kolla.egg-info into
kolla_ansible.egg-info.

Change-Id: I68166156e60e1c34596185792eb66543793c8672
 2016-12-06 12:30:52 +08:00
Christian Berendt
4c39f2e9fc Give plays in the playbooks a name 
Change-Id: I44c2668a8ebb6dd3201a6eb4e47284871380e6d7
 2016-12-05 15:40:56 +00:00
Jenkins
7b598e8ada Merge "Updated from global requirements" 2016-12-05 12:23:46 +00:00
Jenkins
8be141b0e0 Merge "Enable zaqar ui when zaqar enabled" 2016-12-05 12:12:47 +00:00
Jenkins
ab538c2cc6 Merge "Add custom policies in service.json" 2016-12-05 12:12:32 +00:00
Vladislav Belogrudov
0ea98608e5 Sometimes merging of passwords.yml gives json 
Dumping of password dictionary can look quite different depending
on passwords structure. To always get yaml we need to use block
style for dump(), see
    http://pyyaml.org/wiki/PyYAMLDocumentation#Dictionarieswithoutnestedcollectionsarenotdumpedcorrectly

Change-Id: Ideee1aefedbba35480947956821341c6ef75088e
Closes-Bug: #1647308
 2016-12-05 13:17:54 +03:00
OpenStack Proposal Bot
8cd97a5d32 Updated from global requirements 
Change-Id: I5052250825a19af3b1c123b5b2c343ed08e0eaa0
 2016-12-05 09:39:33 +00:00
Jeffrey Zhang
444dbb48cc Read EXTRA_OPTS from env in kolla-ansible script 
Read EXTRA_OPTS from env make it possible that using arbitrary
ansible-playbook parameters in kolla-ansible script. like

    EXTRA_OPTS='--limit control' kolla-ansible deploy

Change-Id: I10e0dafb6138d91facdb66a2f487cdeca4689c28
 2016-12-05 10:25:42 +08:00
caoyuan
9fc5157cc7 Enable zaqar ui when zaqar enabled 
Depends-On:I430340b38ff7642f46d76ec621ae65dcae8157c3

Change-Id: If669601691d1505049ba4196bd3c5856091ed921
Closes-Bug: #1647164
 2016-12-04 23:24:08 +08:00
Jenkins
62c6d5a379 Merge "Fix /etc/kolla permission" 2016-12-04 05:20:36 +00:00
zhubingbing
316f3ea4a9 Enable designate dashboard when enable_designate is yes 
Depends-On: Ic28d984dd2ca3db3633ee535d9475907fa4e2d3b

Change-Id: Ia0b874e3397d1f73dab15e0957e75814bcdfd3ac
Closes-Bug: #1646688
 2016-12-03 15:22:19 +00:00
Paul Bourke
3f035e11b2 Add missing per service Keystone config augments 
The task for keystone is missing a 'per service' entry for it's config
augments. This means for example that users could not add:

/etc/kolla/config/keystone/keystone-fernet.conf

or

/etc/kolla/config/keystone/keystone.conf

and have keystone.conf augmented for those services only.

Change-Id: I8d2570b4a52dc6c3552397b0a6fa7866133dc2f1
Closes-Bug: #1646898
 2016-12-02 16:49:50 +00:00
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
Jenkins
58150b05ae Merge "Disable notifications for cinder when no consumer" 2016-12-02 14:58:45 +00:00