4959 Commits

Author SHA1 Message Date
Jenkins
654a8ffbe2 Merge "Fix removing nova_libvirt container issue" 2016-08-29 19:30:35 +00:00
Jenkins
cb32b2b8d9 Merge "Add missing container image names to build config file" 2016-08-29 13:54:56 +00:00
Paul Bourke
ec40ed3cbb Add a check before wiping Ceph disks in bootstrap
An unwitting user may apply the KOLLA_CEPH_OSD[_CACHE]_BOOTSTRAP label
to a partition assuming it will only use that partition for Ceph, and
end up wiping out their disk.

This change adds a layer of checking to this scenario to try and help
avoid a disaster scenario.

Closes-Bug: 1599103
DocImpact

Change-Id: Ibb9fb42f87a76bc02165ec0b93b60234bad8747a
2016-08-29 14:34:01 +01:00
Kabir Sial
bf61489923 Customizations for dind
This patchset contains customization of Dockerfile of dind
Partially-implements: blueprint third-party-plugin-support

Change-Id: Iba4e3fba86b2b0a7a93b1a971fda308f9111e221
2016-08-29 05:26:06 -07:00
Lu lei
c12230a57c Fix using filter() to meet python2,3
As mentioned in link[1], if we need filter() on python3,
Raplace filter(lambda obj: test(obj), data) with:
[obj for obj in data if test(obj)].

[1] https://wiki.openstack.org/wiki/Python3
TrivialFix.

Change-Id: Ic1ea289c89fad16bc7aa1db42faa9a6b686086d2
2016-08-29 18:44:44 +08:00
Jenkins
90c052dea0 Merge "Change source with dot at extend_start files" 2016-08-29 10:15:24 +00:00
Jenkins
ce50c30427 Merge "Updated from global requirements" 2016-08-29 10:00:22 +00:00
prithiv
c59b2cca0a Dockerfiles for collectd Container
Collectd-ceilometer-plugin is essential for further
more detailed metrics collection, smarter scheduling and service
assurance.

Change-Id: I3a926d9bee592a9bff31a90fa1ffeb0a58f5025a
Partially-Implements: blueprint collectd-ceilometer-plugin
2016-08-29 09:09:16 +00:00
Jeffrey Zhang
9092f4a104 Fix removing nova_libvirt container issue
Retry once when removing or upgrading nova_libvirt to ensure it is
removed

Closes-Bug: #1617741
Change-Id: I8b5046a438c0ef3599a4333bbe77333f0af323ff
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
2016-08-29 08:37:58 +00:00
Duong Ha-Quang
92b2fd94c1 Fix Kibana image build error
TrivialFix
Closes-Bug: #1617877

Change-Id: I029e7589716b7d4fd29d4fc75bafc434ea275a9f
2016-08-29 18:44:43 +07:00
Jenkins
c1a89c62ab Merge "Fix Kibana image build error" 2016-08-29 07:52:14 +00:00
zhubingbing
56838a347e repair aodh image dockerfile
1. Add the missing packages in the aodh image
   packages: pymongo

2. Add aodh sudoer

3. aodh sync db command is error
   sync db command is: aodh-dbsync
   Reference link: http://docs.openstack.org/developer/aodh/install/manual.html

4. Add aodh-api running as a mod_wsgi

   Reference link: http://docs.openstack.org/developer/aodh/install/mod_wsgi.html

Closes-Bug: #1609000

Change-Id: Ia3706794059231fa08444e32eb034d64fbfa5182
2016-08-29 07:24:44 +00:00
Tin Lam
17d36b7364 Chage with_ loop variables syntax to ansible 2
Migrate to full variable syntax in with_ loop for
manila and tempest.

TrivialFix
Partial-Implements: bp ansible2

Change-Id: Ic68fd6123f0cd5bd0035e139e89f7b569574074c
2016-08-29 01:53:37 -05:00
OpenStack Proposal Bot
2aac59a91b Updated from global requirements
Change-Id: Ibf09b0327adc4454864ed0876d58cc52078592e8
2016-08-29 06:11:46 +00:00
Eduardo Gonzalez
8e98e5f15e Change source with dot at extend_start files
Is a best practice in Unix/Linux scripts to use dots
instead of source command.
Using dots will avoid issues with non BASH shells

TrivialFix
Change-Id: Ie6480a1954f853f79faffa093452715ebd9f7d90
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
2016-08-29 07:29:16 +02:00
Jenkins
57d3eaf70c Merge "Customizations for Nova" 2016-08-29 04:44:50 +00:00
Lu lei
46e8196fcf Use six.StringIO
In links: http://pythonhosted.org/six/, we know 'cStringIO' is
a module of python 2.x, but in python3.x module 'io' has the
same function as 'cStringIO' in python2.x. So here we use
six.stringIO instead.

TrivialFix.

Change-Id: I8022b92b186e239cd76a36dab7766301bf96d2c4
2016-08-29 12:03:15 +08:00
Hui Kang
2973bc7dc5 Add missing container image names to build config file
Change-Id: Ib570bf71a2567653f4643adb3670ecf824d83e61
closes-Bug: #1614354
2016-08-28 23:50:44 -04:00
Jenkins
4b7852096f Merge "Customizations for kibana" 2016-08-28 16:25:37 +00:00
Jenkins
ecf85d8d78 Merge "Customizations for MariaDB" 2016-08-28 16:19:24 +00:00
Jenkins
0824940bde Merge "Customizations for Ironic" 2016-08-28 16:08:24 +00:00
Jenkins
a86e13a15a Merge "Customizations for RabbitMQ" 2016-08-28 16:04:07 +00:00
Jenkins
1fd2d434b1 Merge "Fix bandit gate jobs" 2016-08-28 15:51:00 +00:00
Paul Bourke
fc30d583f9 Fix bandit gate jobs
* Inspected each error and fixed / added nosec where appropriate.
* build-swift-ring.py which was throwing sec errors is no longer used so
  removed it.
* Removed the dev/ directory from being checked.

Closes-Bug: #1617713
Change-Id: I25664cabca4137e5c9f499c1af3f5ce78b86fb56
2016-08-28 08:52:44 +00:00
Jenkins
1b806b66e4 Merge "Set 'balance source' for Horizon in haproxy" 2016-08-28 01:07:29 +00:00
Shaun Smekel
a05d4d71a0 Customizations for MariaDB
This patchset contains customization of Dockerfile of the MariaDB
container.

Change-Id: Id234f549376ec68c7f6120d058692aa64dc97de0
Partially-implements: blueprint third-party-plugin-support
2016-08-27 17:29:19 +10:00
Jenkins
90fe72c2d0 Merge "Fix bug in Elasticsearch role" 2016-08-26 20:18:14 +00:00
Jenkins
eb32318e3d Merge "Add dockerfiles for keystone fernet" 2016-08-26 20:09:35 +00:00
Jenkins
1ea09d0752 Merge "Add full support for fernet" 2016-08-26 19:50:58 +00:00
Jenkins
8874c69beb Merge "Move rabbitmq precheck from start" 2016-08-26 19:04:42 +00:00
Christine Hicks
42bd52037e Changed admin-openrc from DOMAIN_ID to DOMAIN_NAME
OpenStack used to used DOMAIN_ID and has switched to DOMAIN_NAME.

TrivialFix

Change-Id: Ibb0574f9267a3bc276304c8079cb230068a13273
2016-08-26 13:09:07 -04:00
Jenkins
6f5703eb5d Merge "Add etcd container" 2016-08-26 16:10:25 +00:00
Paul Bourke
6c238ca3bf Move rabbitmq precheck from start
rabbitmq's start task contains a precheck. This should be part of the
other prechecks for consistency

TrivialFix

Change-Id: I7728ec3f5be3248424d74a4387925b72114b8943
2016-08-26 16:18:04 +01:00
Jenkins
ca100f1f32 Merge "Fix toolbox permission issue when enabling ceph" 2016-08-26 13:19:52 +00:00
liyingjun
54be45e406 Fix toolbox permission issue when enabling ceph
Directory /home/ansible/.ansible and file /var/log/kolla/ansible.log are
not created by default in toolbox image, so when ceph enabled, the directory
and file will be created with user 'root' instead of user 'ansible' after
running bootstrap osds because it using sudo when bootstraping osds,
this will cause permission denied issue for other commands not using sudo.
Fixes this issue by initializing ansible by running 'ansible localhost
--version' using user 'ansible'

TrivialFix

Change-Id: Ibac3f98b3b72cbe287ee1d3a69ed9cea7ae3cd9e
2016-08-26 00:46:46 +00:00
Paul Bourke
9f5efc5ea6 Import the Murano core libary as part of setup
In order for Murano to be operational the core library package must be
imported [0]

Add Ansible tasks to do this idempotently.

[0] http://docs.openstack.org/developer/murano/install/manual.html

TrivialFix

Change-Id: I2c49e9d663595650b885267839012b543505337a
2016-08-25 16:42:09 +01:00
Paul Bourke
d3c60d0035 Customizations for Nova
Change-Id: I7556d6cd473516c7ceb4aba7c1ba1130af2544ee
Partially-implements: blueprint third-party-plugin-support
2016-08-25 14:06:01 +01:00
Shaun Smekel
b597c90827 Customizations for Ironic
This patchset contains customization of Dockerfile of Ironic
containers.

Change-Id: If6ffb741111127886f754ddebd17059174387fc8
Partially-implements: blueprint third-party-plugin-support
2016-08-25 20:22:04 +10:00
Shaun Smekel
3d4ebd6602 Customizations for RabbitMQ
This patchset contains customization of Dockerfile of the RabbitMQ
container.

Change-Id: I5b0120dc63586b3bf2312375de963fe8434a48b8
Partially-implements: blueprint third-party-plugin-support
2016-08-25 20:16:23 +10:00
Shaun Smekel
524868c632 Add dockerfiles for keystone fernet
This adds the docker aspects of fernet key bootstrapping as well as
distributed key rotation.

- Bootstrapping is handled in the same way as keystone bootstrap.
- A new keystone-fernet and keystone-ssh container is created to allow
  the nodes to communicate with each other (taken from nova-ssh).
- The keystone-fernet is a keystone container with crontab installed.
  This will handle key rotations through keystone-manage and trigger
  an rsync to push new tokens to other nodes.

The Ansible component is implemented in:
  https://review.openstack.org/#/c/349366

Change-Id: Id610e00e8c63c7f1bc0974c0aa1b3f44c18e1019
Partially-Implements: blueprint keystone-fernet-token
Partially-Implements: blueprint third-party-plugin-support
2016-08-25 20:13:02 +10:00
Shaun Smekel
1c68ae389b Add full support for fernet
This addresses the ansible aspects of fernet key bootstrapping as
well as distributed key rotation.

- Bootstrapping is handled in the same way as keystone bootstrap.
- A new keystone-fernet and keystone-ssh container is created to allow
  the nodes to communicate with each other (taken from nova-ssh).
- The keystone-fernet is a keystone container with crontab installed.
  This will handle key rotations through keystone-manage and trigger
  an rsync to push new tokens to other nodes.
- Key rotation is setup to be balanced across the keystone nodes using
  a round-robbin style. This ensures that any node failures will not
  stop the keys from rotating. This is configured by a desired token
  expiration time which then determines the cron scheduling for each
  node as well as the number of fernet tokens in rotation.
- Ability for recovered node to resync with the cluster. When a node
  starts it will run sanity checks to ensure that its fernet tokens
  are not stale. If they are it will rsync with other nodes to ensure
  its tokens are up to date.

The Docker component is implemented in:
  https://review.openstack.org/#/c/349366

Change-Id: I15052c25a1d1149d364236f10ced2e2346119738
Implements: blueprint keystone-fernet-token
2016-08-25 20:08:22 +10:00
Paul Bourke
3d12b6c192 Set 'balance source' for Horizon in haproxy
This ensures that the same client IP address will always reach the same
server as long as no server goes down or up. [0]

Prevents a situation where during Murano package upload - we end up
having zip file on one control node but the import continues on another
and ends up failing.

[0] http://cbonte.github.io/haproxy-dconv/configuration-1.7.html#4-balance

TrivialFix
Co-Authored-By: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>

Change-Id: I5f90d2757f31e8b24459a585153d5aa7fe6ad90a
2016-08-25 10:02:57 +01:00
Jeffrey Zhang
d255743601
Move to transport_url for rabbitmq configuration
rabbit_hosts, rabbit_userid and rabbit_password are deprecated for
removal.[0]

rpc_backend is deprecated for removal.[1]

rabbit_ha_queues is deprecated. it is useless when using RabbitMQ >= 3.0
[2]

[0] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L112,#L134
[1] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L46
[2] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L163,L174

Closes-Bug: #1614082
Change-Id: I05d318ba6c11c5dbfa9fbf67d088a43ab465be30
2016-08-25 16:07:42 +08:00
OpenStack Proposal Bot
1e222274e1 Updated from global requirements
Change-Id: Ifbfd85ae44985049fdfb73a90078893511f0beab
2016-08-25 04:59:32 +00:00
Hui Kang
c096825075 Add etcd container
Change-Id: Ib5a853c0048a45d9085c55804580c7ed2fd0fc07
Partially-implements: bp kuryr-docker-plugin
2016-08-24 13:04:47 -04:00
Paul Bourke
158a852998 Add defaults for interfaces to all.yml
The values for 'network_interface' and 'neutron_external_interface' are
missing from all.yml, meaning it is impossible to override them on a per
node / per group basis. (globals.yml get's top precedence).

Make these consistent with the rest of the variables and move the
defaults into all.yml. Operators can still override / update these in
globals.yml as before, but those wanting more flexibility now have it
via host / group variables.

Change-Id: I2575921f76a8e245106da765757c70353bd6762c
Closes-Bug: #1604129
2016-08-24 14:45:14 +00:00
Duong Ha-Quang
1d56fcb4f0 Fix bug in Elasticsearch role
Add Ansbile reconfigure playbook to Elasticsearch role.
Add run condition to start playbook in Elasticsearch role.

Change-Id: I7862089cae55d392eb2d922f89a382d392cf8b97
Closes-Bug: #1616005
2016-08-24 20:12:47 +07:00
Jenkins
bf991ff61f Merge "ironic.conf file missing enabled_drivers info" 2016-08-24 11:47:38 +00:00
Jenkins
0d661a1e59 Merge "Fix Ubuntu binary build and deploy gate" 2016-08-24 11:46:27 +00:00
Jeffrey Zhang
2a1c25d6e3
Fix Ubuntu binary build and deploy gate
Signed-off-by: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Closes-Bug: #1616349
Change-Id: I82a245474392d22017faf30fa89d6dc5e01ab2c2
2016-08-24 16:14:04 +08:00