1582 Commits

Author SHA1 Message Date
Jenkins
dae88516fc Merge "set basic kolla structures for iscsid" 2016-10-13 14:06:28 +00:00
Jenkins
2abef796d6 Merge "Mount host localtime for containers" 2016-10-13 14:06:20 +00:00
Jenkins
db9003e39b Merge "Fix keystone fernet file exchange via ssh" 2016-10-13 13:50:46 +00:00
Jenkins
8ad1ca0fb1 Merge "Fix rabbitmq upgrade permission issue" 2016-10-13 13:50:39 +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
Waldemar Znoinski
96016b756b set basic kolla structures for iscsid
* enable iscsid when ironic is enabled
* update sample inventory files with above
* add logrotate conf template for iscsid
* add 'common' role dependency for iscsi role

Change-Id: I3054b9139a43542febf26c3ce9a71b65f2fcdd84
Closes-bug: #1632850
2016-10-13 10:49:32 +00:00
Jeffrey Zhang
4c207bc039 Fix rabbitmq upgrade permission issue
During the upgrade from Mitaka to Newton, the uid/gid may change for the
same image. Especially on Ubuntu, we moved to Ubuntu Xenial in Newton
and it added systemd related user which break all the uid/gid during an
upgrade. It will the permissions in all docker named volumes.

This fix extends set_config.py to set the proper permission during
container start. This is super light then add commands in
extend_start.sh file  or add ansible tasks.

This patch just fixes rabbitmq case. Other services will be fixed in
following patches.

Partial-Bug: #1631503
Change-Id: Ib17027b97abbc9bf4e3cd503601b8010325b5c5b
2016-10-13 01:19:05 +08:00
Christian Berendt
bedca5b35e Fix keystone fernet file exchange via ssh
* install openssh client in keystone-fernet container
* install rsync in keystone-ssh container
* fix syntax issue in ssh configuration
* copy ssh configuration into keystone-fernet container
* copy id_rsa.pub into keystone-ssh container
* copy id_rsa into keystone-fernet container
* use full path to ssh binary in used scripts
* add missing newlines at EOF
* when using type source set /var/lib/keystone as home
  directory for the user keystone

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: Id6b41030056a69f6516a054beb2fc0e08226e876
Closes-bug: #1623013
2016-10-12 16:29:34 +00:00
Jenkins
40e768ec2a Merge "Add register to upgrade.yml to create correct endpoint" 2016-10-12 14:48:18 +00:00
Jenkins
a6962e28ed Merge "Enable keystone authentication for Barbican" 2016-10-12 13:31:54 +00:00
Jenkins
528425dfcb Merge "Fix 'Address already in use' for barbican-api" 2016-10-12 13:31:23 +00:00
Mick Thompson
ae7d9e3e1e Add register to upgrade.yml to create correct endpoint
Change-Id: I9779d5df65c5d560854dec55cc0a70cb82f895c4
Closes-Bug: #1632697
2016-10-12 14:09:26 +01:00
Jenkins
e6ec2a5184 Merge "Make Kuryr upgrade not crater the upgrade" 2016-10-11 14:24:24 +00:00
Steven Dake
86fe4c99da Make Kuryr upgrade not crater the upgrade
TrivialFix

Co-Authored-By: zhubingbing <zhubingbing10@gmail.com>

Change-Id: Idcd4c0024f93266746a00a2320980c08eca8b7e2
2016-10-11 12:43:53 +00:00
liyingjun
626967c1a4 Enable keystone authentication for Barbican
By default Barbican has not enabled the Keystone authentication:

[pipeline:barbican_api]
pipeline = cors unauthenticated-context apiapp

According to the Barbican install guide[1] this pipeline should be:

pipeline = cors authtoken context apiapp

[1]: http://docs.openstack.org/developer/barbican/setup/keystone.html

Change-Id: I941515a98772a72762b20507e100e7872f3b4ab8
Closes-bug: #1625337
2016-10-11 17:44:17 +08:00
liyingjun
cd0336658f Fix 'Address already in use' for barbican-api
By default barbican uwsgi is configured to listen all address on host
[1], we need to change this to the ip address of the host.

[1]:
https://github.com/openstack/barbican/blob/master/etc/barbican/vassals/barbican-api.ini

Change-Id: I4a1f9fb44ad55caf21f82c1b6d272a9743d65fd8
Closes-bug: #1632177
2016-10-11 17:43:19 +08:00
Jenkins
24ec175f95 Merge "fix mistral requires auth_uri to point to v3 explicitly" 2016-10-11 08:52:00 +00:00
Jenkins
5779833f84 Merge "remove extra blank lines" 2016-10-11 01:37:17 +00:00
Jenkins
b81fec89cf Merge "Add upgrade tasks for Kibana" 2016-10-10 19:42:14 +00:00
Jenkins
6d40d52dcd Merge "Make sahara api worker configurable" 2016-10-10 19:31:09 +00:00
zhubingbing
852329f3d2 remove extra blank lines
TrivialFix

Change-Id: If98f7aff71b5d003effc466cc8b6dbec219792cf
2016-10-10 15:56:29 +00:00
Jeffrey Zhang
0c15da00c8 Fix the wrong setting for Grafana session
The provider_config is configured wrong. And Grafana only supports one
Memcached instance for session, which is bad for high available.

Use mysql to provider the session storage.

TrivialFix

Change-Id: I889a961d7f36f44701654fbac04b4bff05043506
2016-10-10 19:47:32 +08:00
Christian Berendt
2bc6f65340 Add upgrade tasks for Kibana
Change-Id: I860fdc3268d0fdcb775ea345bb0eb621c8dafe07
Closes-bug: #1631902
2016-10-10 12:17:02 +02:00
Jenkins
5a427a941f Merge "integrate gnocchi with cloudkitty" 2016-10-10 06:47:41 +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
zhubingbing
e7df182461 integrate gnocchi with cloudkitty
Closes-Bug: #1630947

Change-Id: Ie28ec6399add384962cfdcf83c93c3bef132d57e
2016-10-10 03:40:48 +00: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
Jenkins
b13b0aad05 Merge "Choose node with largest seqno number for mariadb recovery" 2016-10-09 16:48:49 +00:00
Jeffrey Zhang
1bcb139392 Choose node with largest seqno number for mariadb recovery
When all mariadb nodes are stopped gracefully, mariadb galera will
write it's last executed position into the grastate.dat file. Need find
the node with largest seqno number in that file and recovery from that
node.

Closes-Bug: #1627717
Change-Id: I6e97c190eec99c966bffde0698f783e519ba14bd
2016-10-09 12:08:58 +00:00
Jenkins
c468f5fd09 Merge "change perm and user wsgi file permission" 2016-10-09 08:49:17 +00:00
Jeffrey Zhang
18fa72c901 integrate gnocchi with ceilometer
Closes-Bug: #1626364
Change-Id: I9d586b950b7099a9b160f7b32c9ff00b189a0287
2016-10-09 03:04:07 +00:00
zhubingbing
96bfb5967c fix mistral requires auth_uri to point to v3 explicitly
mistral create keystone client by using auth_uri to v3 explicitly[0]

[0] 7685cdb1b6/mistral/utils/openstack/keystone.py (L174),#L184

Change-Id: Iff38204414289a9aa36232b2c461bc5bdde46e56
Closes-Bug: #1620630
2016-10-09 02:50:03 +00:00
Ryan Hallisey
7fa1a08fd2 Remove unneeded Heka bootstrapping code
The Heka bookstrap doesn't do anything different then
the start code.  Remove the boostrap step since it isn't
needed.

Change-Id: Id9906c6e2cef83fd6d1fcbcbef7a32d9948d07a3
Closes-bug: #1631651
2016-10-08 18:39:29 -04:00
Jenkins
16294f0d00 Merge "fix can't collect horizon log in heka" 2016-10-08 15:16:30 +00:00
Jenkins
9a35c0e679 Merge "add sahara log in heka" 2016-10-08 07:42:53 +00:00
Jenkins
78b3446f48 Merge "Fix genconfig and reconfigure for magnum" 2016-10-07 13:51:04 +00:00
zhubingbing
b46d625b52 add sahara log in heka
Closes-Bug: #1631286

Change-Id: I874913a08e932766d9517bf4740de94146d7b5fb
2016-10-07 13:18:03 +00:00
Jenkins
77a31346d0 Merge "Integrate gnocchi with ceph" 2016-10-07 09:06:44 +00:00
zhubingbing
e4e842be40 fix can't collect horizon log in heka
Change-Id: Idecb70e90ae560d1c41756e3617225556087dd19
Closes-Bug: #1631048
2016-10-07 02:57:15 +00:00
Martin Matyáš
4fa2508e4f Fix genconfig and reconfigure for magnum
Genconfig and reconfigure failing for magnum.
Chainging magnum trust configuretion parameters
to user/domain names instead of ids so they don't
depend on register.yml task anymore.

Change-Id: I55fddf48eafc44892fd0ab96835bfb0b51849d37
Closes-bug: #1630248
2016-10-06 19:39:48 -07:00
Jenkins
b58147bcc0 Merge "Heka template missing optional params" 2016-10-05 16:18:39 +00:00
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
5b7ee00c16 Merge "fixed kestone fernet prechecks for multinode deployments" 2016-10-05 12:09:50 +00:00
Jenkins
c191a7de83 Merge "Fix horizon to use cache" 2016-10-05 12:05:40 +00:00
Paul Bourke
792f16cc9f Fix horizon to use cache
Horizon was missing SESSION_ENGINE from it's conf which means it was not
making use of memcached.

Change-Id: I450aee05f59e344902f1e92d913f4c1ce9e8dcc6
Closes-Bug: 1630509
2016-10-05 12:12:35 +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
Jenkins
3e405312c3 Merge "Handle z stream change for rabbitmq-server" 2016-10-03 16:46:35 +00:00