5268 Commits

Author SHA1 Message Date
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
Jenkins
1432046728 Merge "Install the required packages for ceph-base image" 2016-09-28 15:43:02 +00:00
Jenkins
869aa073b5 Merge "Fix Magnum trustee issues" 2016-09-28 15:34:56 +00:00
Jenkins
8bde923bba Merge "Add newline in grafana template" 2016-09-28 10:51:28 +00:00
Jenkins
3a54a2cb54 Merge "Add a note for how to get prior release kolla doc" 2016-09-28 09:08:16 +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
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
Jeffrey Zhang
55f0642c14 Add a note for how to get prior release kolla doc
Change-Id: Iff8185ebd39f633512a20a07889bd01b6ee4e037
2016-09-27 14:56:28 +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
Jenkins
344318f584 Merge "Fix a docstring typo in build.py" 2016-09-27 13:54:12 +00:00
Jenkins
c241e2adf6 Merge "Changed docker_restart_policy to unless-stopped" 2016-09-27 13:53:46 +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
Kobi Samoray
566c19c887 Fix a docstring typo in build.py
TrivialFix

Change-Id: I556b1563e8abecb14baacd4c84fc72f4bd3cd140
2016-09-27 14:19:57 +03: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
zhubingbing
53451df03e add aodh gnocchi barbican in heka.json.j2
TrivialFix

Change-Id: I956a1d535493e1b6d81ffdf71326f56e81568665
2016-09-27 05:20:50 +00:00
Jenkins
04c4f63a53 Merge "add upgrade.yml in congress role" 2016-09-27 02:44:49 +00:00
Eduardo Gonzalez
45ef86177f Add newline in grafana template
Grafana service fails while login
because a wrong memcached connection.

TrivialFix

Change-Id: I3b73733cd25bace09f1e478cbb770ba6a5ed85a5
2016-09-26 19:11:01 +02:00
Christian Berendt
45f696cfe7 Use keystone-paste.ini template for keystone
The use of the admin_token_auth middleware presents a security risk
and was removed from [pipeline:api_v3], [pipeline:admin_api],
and [pipeline:public_api].

Change-Id: I3a3ca2e74c0ae341105d3481f97956c6da473046
Closes-bug: #1587747
2016-09-26 15:04:44 +00:00
Jenkins
7140bead4b Merge "Fix the failure of ceilometer-api container" 2016-09-26 13:35:03 +00:00
zhubingbing
ccbb5db86a change perm 0644 to 0600 in congress role
TrivialFix

Change-Id: Iafa8e258df8ddc4d53762dafac9b4c3f9abd228f
2016-09-26 11:56:48 +00:00
zhubingbing
9a02511662 add reconfigure.yml in congress role
TrivialFix

Change-Id: I6e3792a3dc1ea22f035554fb87c533c4600b51fa
2016-09-26 11:52:56 +00:00
Jenkins
a9190021ab Merge "Revert "Add enable_elasticsearch option"" 2016-09-26 11:48:02 +00:00
Jenkins
651c1ee4b2 Merge "Revert "Bind EPMD to api interface address"" 2016-09-26 11:25:51 +00:00
Jenkins
1dd9fae441 Merge "install iptables in ironic-inspector container" 2016-09-26 11:22:34 +00:00
Jenkins
de2437ed4c Merge "fix ironic-inspector setup" 2016-09-26 11:22:08 +00:00
Jenkins
6f5c9e5fa1 Merge "add cloudkitty port prechecks" 2016-09-26 11:20:07 +00:00
Jenkins
f3595f2317 Merge "Fix merge_configs.py file when not provide vars parameter" 2016-09-26 10:51:27 +00:00
zhubingbing
cbfc70d879 add upgrade.yml in congress role
TrivialFix

Change-Id: Ia2d5de3676d0595dcbe8f8538b2f2c9bade23942
2016-09-26 10:08:56 +00:00
caoyuan
cfe93911da Fix the url of Cinder endpoints
When use "openstack endpoint list" to list the endpoints of
cinder service, the url is not right. This patch fix it.

closes-Bug: #1627061

Change-Id: I43756421680f4ce59f7cbfb02509aa96c9e5ca9b
2016-09-26 09:40:15 +00:00
Sajauddin Mohammad
3f134d0f53 Changed docker_restart_policy to unless-stopped
Current implementation has docker_restart_policy "always" and
docker_restart_policy_retry:"10" which should be mutually exclusive.
"unless-stopped" will restart the containers on any exit state
but not start on daemon startup if container was put to stopped state before.
Closes-Bug: #1621187

Change-Id: I4d881cd123a55625121b7a9047385e9b54e2e129
2016-09-26 04:32:28 -04:00
zhubingbing
c1d686febe add cloudkitty port prechecks
add check cloudkitty prot and api haproxy in port_checks.yml

TrivialFix

Change-Id: I517a3e3becdc05cb0a5afeaff897ccd63813de09
2016-09-26 07:38:06 +00:00
Christian Berendt
ffbd2c0956 Remove clients from test-requirements already installed by python-openstackclient
* python-cinderclient
* python-glanceclient
* python-keystoneclient
* python-novaclient

TrivialFix

Change-Id: Ia3bfa3ea090d7b7c0978c6f672c7554bfd4b0cc9
2016-09-26 04:21:58 +00:00
Jeffrey Zhang
5cb0e00b77 Fix merge_configs.py file when not provide vars parameter
Use dict.pop(key, None) instead of del dict[key]. dict.pop will not
raise any error when the key is not exist.

TrivialFix

Change-Id: I3808fc865afe6936a5d93eff792e1d1a93ba2085
2016-09-26 11:22:50 +08:00
Jenkins
56603d92dd Merge "Fix heat role creation" 2016-09-26 02:55:02 +00:00