zhubingbing
6b321051a7
change perm and user wsgi file permission
...
change perm 0640 to 0600
change gnocchi user to root, because wsgi config should use root user
TrivialFix
Change-Id: I474788d4d402aaf085534ea15b554d9c69fb1e56
2016-09-27 07:10:56 +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
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
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
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
Jenkins
cf17d234c8
Merge "Change "Virtualhost" to "VirtualHost" in horizon.conf.j2"
2016-09-26 02:53:03 +00:00
Waldemar Znoinski
326327acba
fix ironic-inspector setup
...
* add ironic-inspector(-archive) source to docker image
* pip install from above source code
* move in-container config files to /etc/ironic-inspector
* add sudoers file to allow ironic-rootwrap
* copy rootwrap conf and filters from source repo
Change-Id: Ie3cce19810b9940d06bb636b28015160fea6ddfb
Closes-bug: #1624457
Closes-bug: #1624833
Closes-bug: #1624845
2016-09-25 22:15:04 +00:00
Jeffrey Zhang
7555054e72
Fix the failure of ceilometer-api container
...
* ceilometer-api script is removed and run ceilometer-api by using apache
* fix connection url in ceilometer.conf
Closes-Bug: #1624905
Change-Id: Iffb00ca418bab6521d61b16de4f5760aa1ae1ac7
2016-09-25 14:01:43 +00:00
Jenkins
1ba9297300
Merge "Delete tempest.yml playbook"
2016-09-25 08:07:28 +00:00
Jenkins
276d9b0a48
Merge "Add aodh-api to haproxy.cfg file"
2016-09-25 08:05:04 +00:00
caowei
b515039230
Change "Virtualhost" to "VirtualHost" in horizon.conf.j2
...
TrivialFix
Change-Id: Ia3c6eeb956825e649d57f390c182cb91901f16d5
2016-09-25 12:03:17 +08:00
caowei
7155305824
Revert "Add enable_elasticsearch option"
...
enable_elasticsearch option is already added,in https://github.com/openstack/kolla/blob/master/ansible/group_vars/all.yml#L303
elastic search enable or disable depends on "enable_central_logging" not on "enable_elasticsearch" in globals.yml file.
So remove enable_elasticsearch option from global.yml
This reverts commit f581c81ec630d5302707606228db323e51304a9c.
Change-Id: I1ceff747d7b978dc82efc55fda72b9b98c272f0d
2016-09-25 11:31:59 +08:00
Jeffrey Zhang
127ffc99ff
Delete tempest.yml playbook
...
This file is added by accident. Remove it now.
TrivialFix
Change-Id: I8546f25a3f0368a3351e9f6eceb4c37cde5e56fc
2016-09-24 23:53:12 +08:00
Jenkins
238add7418
Merge "remove not use wsgi other service in aodh"
2016-09-24 14:56:12 +00:00
Jenkins
f7784a8e9b
Merge "add upgrade.yml content for gnocchi role"
2016-09-24 14:52:14 +00:00
Jeffrey Zhang
7608f1ee65
Revert "Bind EPMD to api interface address"
...
This issue still exsits when disable ipv6 feature.
This reverts commit 5480bd9b1d3a9efcd3618ddf12718d2621ceeb47.
Change-Id: I1e6c6bff5585cf5a49890668203d6971112c32f1
2016-09-24 11:25:28 +08:00
Jeffrey Zhang
23aae45163
Add aodh-api to haproxy.cfg file
...
TrivialFix
Change-Id: Iaca1aae8643f4155a862018430bfb0593d6a39e2
2016-09-24 02:56:58 +00:00
Serguei Bezverkhi
911dfe4ef7
ES and Kibana config modification for Kube
...
This PS modifies Elasticsearch and Kibana configuration templates
so genconfig can genarate Kubernetes compatible config for these
services.
TrivialFix
Change-Id: I6886307a163a9ca27a29e6dbdac4f9080948e4b5
2016-09-23 11:58:28 -04:00
Jenkins
76df447012
Merge "add upgrade.yml to aodh"
2016-09-23 14:35:15 +00:00
zhubingbing
d01c97d9c7
add upgrade.yml content for gnocchi role
...
Closes-bug: #1626952
Change-Id: Ib94635d3322dfc31c1dc31fec1ca1eac4f55dedb
2016-09-23 14:34:58 +00:00
Jenkins
4711508aa4
Merge "Add upgrade.yml to sahara"
2016-09-23 14:34:30 +00:00
Eduardo Gonzalez
36f400b80e
Fix heat role creation
...
Change-Id: Ic2a14659f90e5b6060eb695e1f3592db3ae5b907
Closes-Bug: #1626863
2016-09-23 15:23:56 +02:00
zhubingbing
582a17aa15
remove not use wsgi other service in aodh
...
wsgi only aodh-api use
Change-Id: I4e9e67cd211d86e821542c692af35797c224eedc
Closes-bug: #1626900
2016-09-23 08:46:04 +00:00
zhubingbing
364c980ee1
add upgrade.yml to aodh
...
Change-Id: Id874410000782ed5aebbceab3dd9a2ba608a8e30
Closes-bug: #1626876
2016-09-23 07:51:12 +00:00
zhubingbing
44bcd66312
Add upgrade.yml to sahara
...
Closes-bug: #1626555
Change-Id: Ie78835a74965538ba2141a80641384116ef5078c
2016-09-23 03:57:01 +00:00
Jenkins
814ad116db
Merge "Add enable_elasticsearch option"
2016-09-22 17:58:50 +00:00
Jenkins
b1511a1719
Merge "add etcd reconfigure content and do_reconfigure file"
2016-09-22 16:28:05 +00:00
caowei
f581c81ec6
Add enable_elasticsearch option
...
TrivialFix
Change-Id: Id3bbe547637386216a1001c729b277439fbe114f
2016-09-22 23:09:01 +08:00
Jeffrey Zhang
0af4dc86bc
Fix idempotent for initializing toolbox container task
...
TrivialFix
Change-Id: I643940d04ec0c2ffeb95816dde5d1438829c7464
2016-09-22 14:06:28 +00:00
Jenkins
9d7ba661f3
Merge "Create the heat_stack_user/owner role in the heat role"
2016-09-22 09:28:50 +00:00
Jenkins
f0d8b12930
Merge "Only enabled services log files"
2016-09-22 08:16:24 +00:00
Jenkins
ea7b268242
Merge "Remove ansible serial: option for haproxy and rabbitmq."
2016-09-22 08:01:06 +00:00
Jenkins
62c3643f4a
Merge "Allow a custom haproxy configuration file"
2016-09-22 07:48:16 +00:00
Jenkins
eca14f6469
Merge "Add fwaas_driver.ini file to neutron-vpnaas-agent container"
2016-09-22 07:05:39 +00:00