737 Commits

Author SHA1 Message Date
Jenkins
6dfb0d3625 Merge "Remove unused logging import" 2016-01-15 13:35:05 +00:00
caoyue
1f5031fedc Remove unused logging import
it's obviously the code was copied from other place,
let's make it perfect.

Change-Id: I4f24622c497dd65d1d8a3e829a5ef8c4978f6a46
2016-01-15 16:29:01 +08:00
Jenkins
f3ca213580 Merge "Make Barbican the default certificate manager" 2016-01-15 03:38:33 +00:00
Jenkins
b2fd62c9a2 Merge "Fix a problem of memebrs not deleted from pool" 2016-01-15 03:17:54 +00:00
Jenkins
c5ba046cf5 Merge "Disable default haproxy process in amphora image" 2016-01-15 02:06:31 +00:00
Michael Johnson
226eaa55f3 Fix database_tasks log formating
Some database tasks are reporting:
TypeError: not enough arguments for format string

This patch cleans up these log calls

Change-Id: I895ec902cb077df6eb6ae950e0bb1f0b9e40d76f
Closes-Bug: #1513302
2016-01-14 23:51:44 +00:00
Adam Harwell
9fc9eeaf03 Make Barbican the default certificate manager
Local certificate manager is broken and should probably be removed,
since the effort was never taken to make it functional (adding
additional fields for taking raw certificate data in the API).
Barbican should be the default as it is the functional option.

Also taking this opportunity to clean up the config and local.conf
defaults to match reality.

Change-Id: Icf1e89838b761e7d2926c8eb7532404b4c2f19dd
2016-01-14 16:19:54 -06:00
Stephen Balukoff
32ebac96a1 Make pool.lb_algorithm field larger
The field for pool.lb_algorithm is too small to hold the value
"LEAST_CONNECTIONS." This patch expands the size of this field.

Change-Id: I77c7b5136a0427e27897f24ad0a8409818bd5c21
Closes-Bug:1464962
2016-01-14 14:06:35 -08:00
Stephen Balukoff
2564f40e79 Case-sensitive string checking for Enum fields
This patch introduces stricter checking on fields that are in
lookup tables, but are effectively Enum fields. Because we do a
lot of case-sensitive string comparisons against these fields in
various places throughout the code tree, but because SQL does not
to case-sensitive comparisons by default, it's important that we
are case-sensitive in the API for these fields.

Change-Id: Ib23796754ca54f69bb60c79c75804a5e7ee26e29
Closes-Bug:1534217
2016-01-14 08:34:01 -08:00
Elena Ezhova
caecc4f998 Fix updating session persistence of a pool in DB
In case when update data for a pool contains session persistence
it is required to update session persistence table first and
then remove 'session_persistence' key from the update dict.
Otherwise, update will fail and a pool will get stuck in
PENDING_UPDATE status.

This change reuses update_pool_on_listener method of
db.repositories.Repositories class in UpdatePoolInDB task instead
of PoolRepository update method.

This regression was discovered using a scenario test:
https://review.openstack.org/#/c/207945/

Change-Id: I53d6b7962c0baa466db7e053157cdd302edae473
Closes-Bug: #1505125
2016-01-14 13:11:31 +03:00
Jenkins
f941cbbfff Merge "Add debug testenv in tox" 2016-01-13 20:01:44 +00:00
Michael Johnson
8c3e2e1602 Disable default haproxy process in amphora image
This patch disables the default haproxy process from starting in
the amphora image.
Closes-Bug: #1527691

Change-Id: Iccac03b982e47fc85f8e6beb0cc55a80b73ab465
2016-01-13 19:50:41 +00:00
Jenkins
0f9f877006 Merge "Fix sysctl settings for amphora image" 2016-01-13 19:27:28 +00:00
EranRaichstein
080f6101fd Fix a problem of memebrs not deleted from pool
Get_delete_member_flow original tasks order was:

1. DeleteModelObject
2. ListenerUpdate
3. DeleteMemberInDB
4. MarkLBAndListenerActiveInDB

Since memebrs are deleted from Listener only by DeleteMemberInDB,
ListenerUpdate is being called with all members (including the
member that should be deleted). The patch changes the order of
tasks. Calling DeleteMemberInDB before ListenerUpdate (i.e.
switch task 2 & 3) and thus the memebr is removed from HAProxy
List and info is updated to Amphorae as requested.

Change call to DeleteMemberInDB to take member and not member_id
change call to ListenerUpdate to use constants.LOADBALANCER, constants.LISTENER

Change-Id: I159831ca13fc8864798972f75d4b0c6e1fcecf26
Closes-Bug: #1514510
2016-01-13 19:45:51 +02:00
caoyue
90dc020297 Add debug testenv in tox
Once we add debug testenv, we can use "tox -e debug -- --debug"
to debug test cases when tox is running.

Change-Id: Ic0635f2b99c166c77757277e8273f42cdb17ce73
2016-01-13 14:04:13 +08:00
Jenkins
96cc647a96 Merge "Fixed revert of update LB" 2016-01-13 05:44:50 +00:00
Jenkins
9b4f651ab7 Merge "Move docstrings to the first line of the function definition" 2016-01-13 04:47:26 +00:00
Jenkins
8a9ec92fb5 Merge "Remove OpenSSL from cert_parser" 2016-01-12 22:17:25 +00:00
dean
39aa0f834d Fixed revert of update LB
was reverting listeneter instead of lb

Closes-Bug: 1533358
Change-Id: I600bbaa600e8f9400648242e2e1bea9a3ae841ba
2016-01-12 22:46:15 +02:00
Jenkins
ff358d4d2d Merge "Setup health manager networking for devstack" 2016-01-12 16:31:28 +00:00
ptoohill1
436ae33abc Remove OpenSSL from cert_parser
Utilize cryptography package instead of OpenSSL in the cert_parser

Change-Id: I7e07138c265fd75efea0f20cd6b32819e7bd1baf
Close-Bug: 1532347
2016-01-10 23:35:10 -06:00
Jenkins
7ee8cc6076 Merge "Replace deprecated library function os.popen() with subprocess" 2016-01-10 00:07:15 +00:00
LiuNanke
fc5f1d3c03 Replace deprecated library function os.popen() with subprocess
os.popen() is deprecated since version 2.6. Resolved with use of
subprocess module.
Closes-bug: #1529836

Change-Id: Ibdb8f13462e8416097006e19eb2214425364910e
2016-01-09 20:07:04 +00:00
Peng Zhi Xiong
7e2b178283 Fix some inconsistency in docstrings
Added colon after ":param" according to:
http://docs.openstack.org/developer/hacking

Change-Id: Ie8d6a12ae8cdcbafdd30e619aaffc2e6c8aacc7f
2016-01-09 07:53:48 +00:00
Brandon Logan
8e24232371 Setup health manager networking for devstack
When running the health manager on single host devstack machine, the
hosts IP cannot simply be used as if the health manager is running
on a host by itself.  The solution here is to create a neutron port
on the lb-mgmt-net which sets up necessary ovs ports and also
reserves an IP.  Then the script creates an ovs port for and sets
and interface with the information the neutron port create allocated.

There are some flaws with this but its a starting point and can and
probably will be improved on in the future.  However it works for
now.

Change-Id: Ic3d3d1d63a5cc352c5fc00dea58bb16915754a7c
Closes-Bug: #1490033
2016-01-09 00:22:54 -06:00
OpenStack Proposal Bot
cc7189d3f6 Updated from global requirements
Change-Id: I53184516d46d6cb7ad9eb421e712773e1cd7144d
2016-01-09 05:57:51 +00:00
Stephen Balukoff
e035cc0f28 Fix minor inconsistency in models code
We have an IdMixin. All the other objects with an ID here use it.
No point in inconsistently defining 'id' with the Amphora model.

Change-Id: I7758c08536e13d3ef653a604bcc74e1896c7d143
2016-01-08 15:49:29 -08:00
Peng Zhi Xiong
e0dff5a6e4 Move docstrings to the first line of the function definition
according to http://docs.openstack.org/developer/hacking/

Change-Id: Icd8755e79b400c9b2b567386bba5f29b3f39a244
2016-01-08 02:13:18 -08:00
Bo Chi
5dedb6c03d Assign load_balancer in _port_to_vip()
In _port_to_vip() which will be called by allocate_vip() it didn't
assign value to vip.load_balancer. This caused a exception in the
revert path in deallocate_vip(), which used vip.load_balancer.id

Change-Id: I31770e331edc1511385c3ba334afce6fc8af271c
2016-01-08 09:40:18 +00:00
Jenkins
af2959c1f4 Merge "Optimize Taskflow storage (remove some requires parameter)" 2016-01-06 23:59:09 +00:00
Jenkins
05ab31ded9 Merge "Add nopreempt support for active/standby" 2016-01-06 06:22:07 +00:00
Jenkins
5a49297c2c Merge "Use keystoneauth to prevent logging sensitive data" 2016-01-06 01:39:29 +00:00
Jenkins
040e29985d Merge "Test: make enforce_type=True in CONF.set_override" 2016-01-06 00:32:13 +00:00
Jenkins
6a1eb316e5 Merge "Make Consumer an oslo_service" 2016-01-05 23:49:14 +00:00
LiuNanke
835566ef69 Test: make enforce_type=True in CONF.set_override
Each config option has limitation for type and value.
In production code, oslo.conf can ensure user's input
is valid, but in unit test, test methods can pass if
we use method CONF.set_override without parameter
enforce_type=True even we pass wrong type or wrong
value to config option. This commit makes sure calling
method CONF.set_override with enforce_type=True.

Change-Id: I1e4f2aa5797ba8582a5637cd86c6b2b626daa923
Closes-Bug: #1517839
2016-01-06 01:59:39 +08:00
OpenStack Proposal Bot
a6ccda6f68 Updated from global requirements
Change-Id: Icc2a52c53e2d0bcf6c043a18d959b0a33a01bbaf
2016-01-01 20:31:41 +00:00
Jenkins
7a8143234a Merge "Database repository delete to use one()" 2015-12-21 04:20:17 +00:00
Brandon Logan
4a6e5a3f21 Make Consumer an oslo_service
This makes more sense and also suppresses the error messages when
launching the service returned from oslo_messaing.get_rpc_server
service.  Instead of that service wait() being called, the Consumer's
wait will be called.

Change-Id: I63816e92fbe26a4213946e6ab584531bdc3b7dd2
Closes-Bug: #1527418
2015-12-20 13:22:01 -06:00
Michael Johnson
cd5a50adb3 Fixes gate failure 'update_stats' called 0 times
There were some bad unit tests that would fail depending on the test
order.  This would intermittently cause gate failures.
This patch corrects those unit tests.
Closes-Bug: #1526942

Change-Id: Id80a0a1a71a8248e5709f7df8c9af6a93a412f93
2015-12-18 20:06:23 +00:00
Michael Johnson
12b1e57561 Fix sysctl settings for amphora image
This patch fixes two things:
1. The sysctl settings were failing because some conntrack modules
were not loaded anymore.
2. I fixed the sysctl-set-value scripts to be able to handle
multi-value settings, such as tcp_rmem, in tripleo-image-elements[1].
Here I have removed the workaround we had in Octavia.

[1] https://review.openstack.org/#/c/134616/

Change-Id: Ib7ab4f487c1b792b70a110098bf7a28cb565ee55
Closes-Bug: #1527392
2015-12-18 01:01:19 +00:00
Adam Harwell
f340cdceda Use keystoneauth to prevent logging sensitive data
Change-Id: Ifa5256175a9d5ba2ca07a8a7846cb98e5f1b9898
2015-12-16 14:35:28 -08:00
OpenStack Proposal Bot
ea4018b51f Updated from global requirements
Change-Id: I5165b092651185aa3137c0dd6def2d1b0c197295
2015-12-15 21:28:07 +00:00
Michael Johnson
230c9b85fb Database repository delete to use one()
Updates the db repository "delete" to use one() instead
of first()


Change-Id: Idb29fab6dbfdb1c69628a19962b3a4103dd5c48c
2015-12-15 17:58:34 +00:00
OpenStack Proposal Bot
b5a374b26b Updated from global requirements
Change-Id: If02bd5249c7f615d8df9a8d8ed628c2e400f336a
2015-12-11 22:52:16 +00:00
Jenkins
06f46b7cec Merge "Rename tenant_id in the network models to project_id" 2015-12-10 19:50:30 +00:00
Jenkins
97be0b2477 Merge "Expose project_id in octavia api" 2015-12-10 18:27:34 +00:00
James Arendt
ce21995319 Make Octavia devstack pass env settings to sudo pip install
Current code to install diskimage-builder requirements in
devstack does not pass on enviroment settings to sudo, which can
cause the pip install to fail behind a proxy.

This happens when the user has http_proxy/https_proxy values set
but not for root.  The stack.sh runs and installs for a while,
before failing on the Octavia diskimage-builder.

Change-Id: I196aca7004ea0eed713877e54ba10dcfe1d343e7
Closes-Bug: #1526108
2015-12-10 07:40:16 -08:00
OpenStack Proposal Bot
178a07db9f Updated from global requirements
Change-Id: Ia523937b1d39568841d76a4dd489ab2e59a24f2f
2015-12-10 12:45:20 +00:00
Jenkins
a3b251d72b Merge "Refactor BarbicanAuth to allow for configurable auth method" 2015-12-10 06:47:20 +00:00
Jenkins
5e44f2f1b9 Merge "Allow choice of upstart or sysvinit" 2015-12-09 17:58:17 +00:00