1362 Commits

Author SHA1 Message Date
Paul Bourke
dcd8dda99f Heka template missing optional params
If enable_rabbitmq or enable_keystone are false, the configs will not be
copied to target nodes for these. This resulted in Heka failing to
start.

Change-Id: I93d15534802b671f1f42e8b2dfb523a17526ffb7
Closes-Bug: #1630613
2016-10-05 15:30:38 +01:00
Jenkins
c9cbadcf40 Merge "Fix sahara endpoint url" 2016-10-04 21:44:04 +00:00
Paul Bourke
cc0709792b Fix l3_agent.ini rendering error when DVR
The if/else blocks in this file cause a rendering error on control nodes
when enable_neutron_dvr: yes

ParsingError: File contains parsing errors: <???>
        [line  3]: u'    external_network_bridge =\n'

Change-Id: Ia461dcbbec531c4c6295b3c7e10da12c57b7d58b
Closes-Bug: 1626995
2016-10-04 16:22:31 +01:00
Jenkins
3eac91d526 Merge "Change mysql-check in HAProxy to post MySQL 4.1" 2016-10-04 07:01:41 +00:00
Jenkins
cac300e0c8 Merge "Iscsid container fails to start on storage node when cinder is enabled" 2016-10-03 17:35:28 +00: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
Nikita Gerasimov
cfff7b09a8 Change mysql-check in HAProxy to post MySQL 4.1
By default HAProxy send pre-4.1 authentication packets which are cause
warnings on server side. To use modern MySQl authentication mysql-check
configuration have to include post-41 option.

Change-Id: I88609d3a0cc3ce4a10e64ba65230ba4d97f34419
Closes-Bug: 1629911
2016-10-03 19:07:50 +03:00
Jenkins
f9f619d208 Merge "Fix ironic failed" 2016-10-03 15:58:09 +00:00
Mark Duggan
74c85cfe82 Iscsid container fails to start on storage node when cinder is enabled
When the iscsid containers is included in the kolla deployment it starts
successfully on a compute node but fails to start on a storage node, if
cinder is enabled because the config file is not copied to the container
BTW, if cinder is not enabled the iscsid container starts successfully
on both the compute and storage nodes.

Change-Id: I665535d858affebc9623b29f79c89c18f7cc399f
Closes-Bug: #1629381
2016-10-03 14:57:17 +00:00
Jenkins
b482611a2d Merge "Remove redundant common play and add haproxy hosts" 2016-10-03 13:34:42 +00:00
Jenkins
74c508faa5 Merge "Add CADF event configurations in Keystone when enabled" 2016-10-03 10:49:32 +00:00
Jeffrey Zhang
903b0ff211 Fix ironic failed
* Mount system folder in ironic-conductor
* Add package need in ironic-conductor
* Fix the log path issue
* Add ironic sudoer in ironic-base
* Fix credential issue
* Do not start nova-compute when enable ironic

Closes-Bug: #1629334
Change-Id: If9d478c6513de37465403d458a88cf0da7ebd8a6
2016-10-03 07:53:21 +00:00
Narasimha SV
bfd032add4 Add CADF event configurations in Keystone when enabled
By default CADF events added even if they are disbaled in all.yml.
Boolean check is missing is added so that CADF configurations will
be added only if it is enabled.

Change-Id: I757ae176228cc4e74d06ce85b27200bdcdd5dd5c
Closes-Bug: #1607904
2016-10-01 16:33:23 +00:00
Jenkins
99e65fda54 Merge "Add bootstrap_service.yml to upgrade.yml" 2016-10-01 15:34:21 +00:00
Andrew Widdersheim
4963898b21 Remove redundant common play and add haproxy hosts
In cf0c25c37 [0] a play was added to run the common role against all
hosts. This ends up being redundant since every role includes the common
role as a dependancy. The reasoning behind this change as pointed out by
the author in the review comments [1] was so that an operator could run
with '--tags common' and just have the common role applied.

To avoid redundancy, the common play has been removed and tags have been
added to the common role. This allows for just the common role to run
when another role is including it while reducing redundancy.

A side affect of removing the common playbook which runs against all
hosts is that not all facts on all hosts are gathered at the beginning
of the site.yml. This breaks the haproxy role since it relies heavily on
facts to build out the haproxy.cfg file.

Previously, the haproxy role would include several hosts purely for fact
gathering purposes as pointed out in c68c9d95 [2] and a guard was put in
place so that the tasks would only run against the 'haproxy' group. In
423e3f3f [3] these hosts were removed. After reading the review [4],
this seems to have been done without fully understanding why the hosts
were there in the first place.

This change did not break anything however since the common role that
ran on all hosts mentioned previously would gather all of the facts
necessary.

To fix this fact gathering issue replace the common role play with a
play that will simply gather facts with an 'always' tag to ensure it is
run regardless of what might be passed in the '--tags' argument by the
operator.

Kudos to Paul Bourke for helping identify many of these issues.

[0] cf0c25c37d
[1] https://review.openstack.org/#/c/369212/
[2] c68c9d95fc
[3] 423e3f3fdf
[4] https://review.openstack.org/#/c/355861

TrivialFix
Closes-Bug: #1628472

Change-Id: Ia94146579e743935501f1ff4b4c1bf6cb7c43aa3
2016-09-30 11:56:42 -04:00
Jenkins
789f50b2f3 Merge "Fix mistral service" 2016-09-30 12:29:41 +00:00
Jenkins
60e13ec142 Merge "iscsi role misses 'storage' group" 2016-09-29 15:39:48 +00:00
Jenkins
4ca9b5111f Merge "Fix wrong heat trustee configuration" 2016-09-29 15:39:05 +00:00
Jenkins
5fbdee9bbf Merge "Fix error in Gnocchi service" 2016-09-29 13:14:51 +00:00
Jeffrey Zhang
89d38770ce Fix error in Gnocchi service
* mount gnocchi volume for gnocchi-api and gnocchi-statsd
* fix the failed of gnocchi-api
* use gnocchi user when running gnocchi-upgrade
* use the app.wsgi file in python path directly, rather than copy it to
  /var/www/cgi-bin/gnocchi/app file

TrivialFix

Change-Id: Ie026b8f44cd8e9703bf115cebb4e2d50b114a3a2
2016-09-29 12:06:15 +00:00
Vladislav Belogrudov
d5ae21a70b iscsi role misses 'storage' group
Cinder-backup containers require iscsid to mount iscsi volumes
to backup if the volumes are on different storage host. This
fix adds missing 'storage' group to iscsi playbook.

Change-Id: Iba3fb861b3f14c20b8a020075f2473ba7a0dd9a2
Closes-Bug: 1611330
2016-09-29 14:27:16 +03:00
Jenkins
cdc738ee34 Merge "Mount host localtime for ceilometer" 2016-09-29 10:13:41 +00:00
zhangyanxian
54f255fe9c Fix typo in start.yml
TrivialFix

Change-Id: I23d74821c7f65cdf20c214f7622f4df0d3c0e172
2016-09-29 09:03:03 +00:00
Jeffrey Zhang
ca26f55d5c Mount host localtime for ceilometer
Change-Id: Ia4a9e132683a8328cb2ff6d7e28e3560f2a8614e
Closes-Bug: #1628584
2016-09-28 23:49:34 +08:00
Jenkins
869aa073b5 Merge "Fix Magnum trustee issues" 2016-09-28 15:34:56 +00:00
Eduardo Gonzalez
a71874f24f Fix mistral service
- Add mistral in HAproxy
- Set mistral api to bind on api_interface
- Fix mistral endpoint
- Add database population on bootstraping
- Add mistral port prechecks

Change-Id: If1617fb9dcd8b3bbd4f94c68ca87c36e39711016
Closes-Bug: #1626570
2016-09-28 17:21:51 +02:00
Jenkins
8bde923bba Merge "Add newline in grafana template" 2016-09-28 10:51:28 +00:00
Jenkins
974bffae1e Merge "add congress api to haproxy" 2016-09-28 06:45:45 +00:00
Jenkins
206edae28d Merge "Rename the gnocchi api-paste filename" 2016-09-28 06:18:52 +00:00
Jenkins
205c0699c8 Merge "Use merge_configs for gnocchi-api-paste.ini file" 2016-09-28 06:17:32 +00:00
Vikram Hosakote
3c45625197 Fix Magnum trustee issues
This patch set fixes all Magnum issues in kolla master.

The [trust] section set to magnum.conf
using created trustee domain and user for Magnum
in ansible/roles/magnum/tasks/register.yml using ansible
openstack modules.

Bump shade to 1.5.0 in kolla-toolbox because of
os_user_role ansible module dependency.

Certificate storage is changed from 'local' (non-production)
to magnum's internal storage (x509keypair) or barbican.

Co-Authored-By: Martin Matyas <martinx.maty@intel.com>
Change-Id: Ifcb016c0bc4c8c3fc20e063fa05dc8838aae838c
Closes-Bug: #1551992
2016-09-27 21:23:46 -07:00
Martin Matyáš
57ba2cd22f Fix wrong heat trustee configuration
"project_domain_id" and "project_name"
cannot be specified [trustee] section or keystone will throw a
"cannot be scoped to multiple targets" error when we attempt to get
a token scoped to a trust.

Change-Id: I167c0e31835d05b8069fd931ef76fb337dd99207
Closes-Bug: #1628353
2016-09-27 21:04:32 -07:00
zhubingbing
bcf7afb801 add congress api to haproxy
TrivialFix

Change-Id: Ie836e1e12a40692b7da3cdd24b0a980ee6081b16
2016-09-28 04:03:43 +00:00
Jenkins
622c88ec99 Merge "Update manila-share.conf" 2016-09-27 16:38:54 +00:00
Jeffrey Zhang
87f019481e Rename the gnocchi api-paste filename
* Rename gnocchi-api-paste.ini to api-paste which is used in gnocchi
* Copy api-paste.ini to /etc/gnocchi in container

TrivialFix

Change-Id: I0ea5d947f3a4323e641a041fb190cae3031d36b2
2016-09-27 15:03:07 +00:00
Christian Berendt
c4fa05115c Use merge_configs for gnocchi-api-paste.ini file
TrivialFix

Change-Id: I0ab0ea635e630390d43f12a5521f12e102b2351b
2016-09-27 15:01:49 +00:00
Jenkins
3214906276 Merge "change perm 0644 to 0600 in congress role" 2016-09-27 14:59:51 +00:00
Jenkins
1502ad94f1 Merge "change CollectD to collectd in collectd role" 2016-09-27 14:43:19 +00:00
Jenkins
e974f41b97 Merge "remove bootstrap.yml in grafana role upgrade.yml" 2016-09-27 13:56:56 +00:00
Jenkins
6015d5354f Merge "Add aodh checking to port_checks.yml" 2016-09-27 13:56:45 +00:00
Francisco Edigleison Barbosa
b1a91dc161 Update manila-share.conf
Remove unused variable

a97983dd0e/manila/share/drivers/service_instance.py (L60-L64)

TrivialFix
Change-Id: I8f1ec970dfbbea27da566ad0f92fe087ac0aa582
2016-09-27 10:47:41 -03:00
zhubingbing
01db7b7510 change CollectD to collectd in collectd role
TrivialFix

Change-Id: Iea79cb14d50def9f444ab55c9b410b09a199ca63
2016-09-27 12:33:26 +00:00
Jenkins
e179d46f52 Merge "Fix the url of Cinder endpoints" 2016-09-27 11:37:37 +00:00
Jenkins
9723f3b5f5 Merge "add reconfigure.yml in congress role" 2016-09-27 09:49:51 +00:00
Jenkins
740e68ccaa Merge "add sahara port prechecks" 2016-09-27 09:48:05 +00:00
caoyuan
aa436c5b26 Add aodh checking to port_checks.yml
TrivialFix

Change-Id: I5c9cb7a142baaa398efb215db7b74b32c392dae0
2016-09-27 16:47:54 +08:00
Jenkins
b27f11384d Merge "add aodh gnocchi barbican in heka.json.j2" 2016-09-27 08:08:38 +00:00
zhubingbing
01d16a8506 add sahara port prechecks
add check sahara prot and api haproxy in port_checks.yml

TrivialFix

Change-Id: I50ad7b0308a2a2f13d575efb0dfdb5385d372904
2016-09-27 08:07:19 +00:00
zhubingbing
f9fcc192cf remove bootstrap.yml in grafana role upgrade.yml
beacause upgrade is not required to re create the database

TrivialFix

Change-Id: Ia0a776ecef61f80450edce093ac631b092532fc7
2016-09-27 07:04:17 +00:00
caoyuan
ec2f8afb0e Add bootstrap_service.yml to upgrade.yml
TrivialFix

Change-Id: I3b77ec200ac147eef96ef3850ba698186b2e0cb8
2016-09-27 14:41:45 +08:00