3056 Commits

Author SHA1 Message Date
Michael Johnson
3567965154 Fixes a config load bug for keystone v3 domains
The config loading code for keystone v3 authtokens
require domian paramters, but the keystone middleware
currently doesn't have those configuration options.
This fixes the config loading for the domains.

Change-Id: Ieb1571e64ef52b8e48fe21883d3c9f57c8402a54
2015-04-29 17:38:40 +00:00
ptoohill1
a062968d2b Removes include_members from jinja_cfg
The include_memebers check is not required

Change-Id: Ib758a834f24d97e6e281975272ebdf4cf7320d54
2015-04-28 23:57:49 -05:00
minwang
321bc765ae Fix Octavia complexity issues
This is for fixing the octavia issue.
We ran the Octavia code base through a static code analyser and several issues got flagged.
As an exercise we looked at each issue and are now proposing fixes to the complexity/code style issues.

Change-Id: I2fc0cf213a9f7488e7cf1dff789d98ca2deeb81f
2015-04-28 13:17:10 -07:00
Brandon Logan
a48ccb03fb Fix ups so pbr and setup works
Moved octavia/bin directory to octavia/octavia/cmd and renamed octavia-api to
api.py.  This follows the new strucutre most openstack projects are doing.
Also implemented octavia-api being built when doing setup install.

Had to remove the octavia/tests/specs symlink because pbr did not like it and
would not allow anything to be built. Also found out the test_titles test was
not being run on the specs, so that has been added as a separate tox
environment.

Change-Id: I92f2bc6eaa346983f7a2479dc9fa43d2040f2cd5
2015-04-23 16:04:27 -05:00
ajmiller
08e95875b8 Fix "Revises" comment to be consistent with reality
Change-Id: If8f8995d2acbab41026a06338941b746196df6e4
2015-04-23 10:49:00 -07:00
Jenkins
9360f32ef8 Merge "Added neutron allowed address pairs network driver" 2015-04-23 02:09:55 +00:00
ptoohill1
6c85431e53 Use stevedore to load API handler
Updates controller base to load handler via stevedore
Updates setup.cfg with entry point
Updates octavia.conf for api_handler default example
Updates config.py for api_handler
Updates requirements.txt for stevedore

Change-Id: I67e3da376fad1d48cec7f56f990c4b13ac7f4b83
2015-04-22 17:59:14 -05:00
Jenkins
fc5eb91a68 Merge "Adds plug VIP and plug Port to spec" 2015-04-22 20:47:57 +00:00
Jenkins
4d53679f0e Merge "Added vrrp_ip and ha_ip to amphora models" 2015-04-22 20:25:58 +00:00
German Eichberger
1c15a79ebf Adds plug VIP and plug Port to spec
Change-Id: Ic983b184ecac5a37994ee4115a026b42224c3e1a
2015-04-21 14:36:34 -07:00
Michael Johnson
b88d5ee53b Fix the common/keystone.py for identity v3
tenant_name is no longer accepted for the v3 client authentication.
This patch updates that to project_name which is accepted on v3.

Change-Id: Iccc460c1a4bae10ff530ce09888b877bfd5c39f4
2015-04-21 00:38:46 +00:00
Jenkins
c9494a83a2 Merge "Allow id to be added in POSTs for all entities" 2015-04-17 00:16:40 +00:00
Brandon Logan
44bda48a91 Allow id to be added in POSTs for all entities
This is to allow neturon-lbaas to be able to give its own ids so it
can know what id octavia is tracking.

Change-Id: Id49c7971894228fdf56189df86175fd35c6ed5ca
2015-04-16 16:31:44 -05:00
ptoohill1
03f1d5d88c Updates service and config for Octavia API
Updates bind_port default to something not already used(hopefully)
Updates prepare_service to follow oslo_log new behaviour
Updates octavia.conf bind_port default

Change-Id: I399aeb200bccb97ada4e8d59ac7b3ffb0646fb6d
2015-04-16 01:27:28 +00:00
Carlos D. Garza
939e685d96 Switched from sha265 to sha256 in octavia.conf
Seems sha256 is more popular then sha265.

Change-Id: I19eec93410973d68f5d221a7964211e8af06c2d8
2015-04-15 16:17:26 -05:00
Michael Johnson
8c9ee6d230 Corrected some __init__() parameters
Removed log from __init__() parameters
Removed get_logger methods
Updated specs for above
Added optional region parameter to noop compute driver

Change-Id: Ie3ed4ebb5d0407cb18f7cf957334dab4bb821bf7
2015-04-13 23:03:54 +00:00
Jenkins
5bd04f8471 Merge "Fixed sessionpersistence and healthmonitor refs" 2015-04-13 19:26:23 +00:00
minwang
0a49aa4b31 Add compute noop driver and test case
1. implement methods in noop_driver/driver.py
2. add unit test class in test_compute_noop_driver

Change-Id: Ifc31c7d819ededd7f350cd1d4207ffd48c49a8bb
2015-04-13 11:45:14 -07:00
Jenkins
f7236de450 Merge "Add network noop driver" 2015-04-13 18:39:14 +00:00
Jenkins
6ee4fb2fb1 Merge "Fix arg order for Update functions in Controller-Worker" 2015-04-13 18:30:07 +00:00
minwang
480ad90229 Add network noop driver
1. implement methods in noop_driver/driver.py
2. add unit test class in test_network_noop_driver

Change-Id: I48cf1c051e7d3427b918f686bf8788c077e7d829
2015-04-13 10:35:34 -07:00
Jenkins
a0d831cbe8 Merge "Added post_vip_plug method to the amphora driver" 2015-04-13 16:15:34 +00:00
Adam Harwell
b57da1b097 Fix arg order for Update functions in Controller-Worker
Also fix the docstrings while we're here.

Change-Id: I84f9de160c5c61bac01e86a5a142fd1111a7bda9
2015-04-13 10:19:20 -05:00
Brandon Logan
961f304ca1 Added post_vip_plug method to the amphora driver
Fixed some doc'ed docstrings as well to satisfy someone's OCD.  I won't name
names but they're name rhymes with Hadam Arwell.

Change-Id: I0b6482cda29c556918c2b2eb8b03cdec30b0b7c3
2015-04-13 02:21:46 -05:00
Brandon Logan
1fb924146b Fixed sessionpersistence and healthmonitor refs
The jinja config translation layer references the pool data model's
session persistence and health monitor as pool.sessionpersistence and
pool.healthmonitor. It should be pool.session_persistence and
pool.health_monitor.

Change-Id: I7664d7498a7dd69896f47937b8440ceb94db653f
2015-04-13 01:22:19 -05:00
Jenkins
f3c9784309 Merge "Updating the disk image builder code" 2015-04-10 21:40:52 +00:00
Jenkins
39f3f5f750 Merge "Implementation for bp/api-to-oslo-messing-handler" 2015-04-10 21:16:42 +00:00
Michael Johnson
9b47e9a4c5 Updating the disk image builder code
Adds haproxy 1.5.x from ubuntu trusty backports
Adds a git pull for the amphora agent code
Removes check for argparse (internal for python 2.7)
Adds sysctl net.ipv4.ip_nonlocal_bind=1

Change-Id: I7aecf727fb5d9be08982c5a32ae3c6e280ebda14
2015-04-10 21:03:17 +00:00
Brandon Logan
85838dbb4c Added neutron allowed address pairs network driver
This driver will allocate a neutron port and fixed_ip on the VIP's network.
Upon plugging the VIP, it will use neutron's allowed address pair to allow
traffic destined for the ha_ip to pass to raised on amphora interfaces.

Change-Id: I7bce4c2bbb9b35905c21caf79cb865e0ca146dac
2015-04-10 15:24:48 -05:00
Brandon Logan
7e11665bc5 Added vrrp_ip and ha_ip to amphora models
vrrp_ip will typically be the ip through which the amphora communicates with
its vrrp peer.

ha_ip will typically be the ip that is shared between the amphorae.

Since it is possible each amphora may have a different ha_ip and vrrp_ip,
it makes sense to add them to the model/table.  Adding them now because the
network driver will be assigning the values.

Changed the network driver spec and base class to mention the plug_vip method
should return a list of amphoras.

Change-Id: I04a97caf00bc6fa25f94e6470d3ed7da48880ae6
2015-04-10 15:07:24 -05:00
Michael Johnson
1bb0402062 Removing a log parameter from the noop driver
We don't want to pass in a log object on amphora drivers.

Change-Id: I4c8c099fbeea352ff9d47af077f807eab49b7347
2015-04-10 16:40:09 +00:00
minwang
86ec61f961 Add health check amphora-driver-interface
Add the specs in amphora-driver-interface and driver_base and noop-driver under amphora driver

Change-Id: Ie97f4156ba1a6c7db0d59c202b752345be004cf3
2015-04-08 15:02:01 -07:00
Carlos D. Garza
0969dcb7a8 Implementation for bp/api-to-oslo-messing-handler
Implements: blueprint api-to-oslo-messaging-handler

Change-Id: Ia23418943c6c21032bf204132a8118ace237ef10
2015-04-08 21:46:54 +00:00
Jenkins
39d20059ca Merge "Adding post_network_plug to the noop amphora driver" 2015-04-08 21:07:04 +00:00
Jenkins
c5fcdbeab4 Merge "Updates Jinja templater with additional optional params" 2015-04-08 19:16:52 +00:00
Jenkins
0776e2fa4c Merge "Adds rise threshold to configuration generation" 2015-04-08 18:43:57 +00:00
Michael Johnson
8e7eb281d0 Adding post_network_plug to the noop amphora driver
Change-Id: Ifcba52309cdb40b2e832108c558c01da95805272
2015-04-07 23:51:19 +00:00
OpenStack Proposal Bot
d16d73a27f Updated from global requirements
Change-Id: Iada56d49979685305b341c6b9b0d82fcf3c436b8
2015-04-07 22:00:32 +00:00
ptoohill1
3fd102f226 Adds rise threshold to configuration generation
Updates jinja templates for rise threshold
Updates jinja templater for rise threshold
Updates tests and sample configs

Change-Id: I4a4b109e77562b7c1af5494c80020cb3c121420d
2015-04-07 11:12:31 -05:00
ptoohill1
76da1c0bac Updates Jinja templater with additional optional params
Added optional logging params
Added optional timeout params

Change-Id: I2ca1ff0ab889ed2048b7fbfc36018fac23c4474e
2015-04-06 11:38:42 -05:00
Jenkins
2b45684380 Merge "Fix stale pyc issue for unit tests" 2015-03-31 20:35:24 +00:00
OpenStack Proposal Bot
dfeafc271b Updated from global requirements
Change-Id: Ie0f6b800500f61e5dfa1b6b810b473313bd19cc6
2015-03-31 18:40:05 +00:00
Adam Harwell
28c7eacab2 Fix stale pyc issue for unit tests
See the following for more info:
* http://lists.openstack.org/pipermail/openstack-dev/2014-September/045845.html
* http://lists.openstack.org/pipermail/openstack-dev/2014-September/045873.html
* https://review.openstack.org/#/c/121044/

Change-Id: I98161082cd72b92a7af44f8be8b5a92328a72281
2015-03-31 11:18:31 -05:00
Brandon Logan
98792dd462 DRY'ed keystone session creation and retrieval
Also corrected importing of keystone config options

Change-Id: Icf4ea584bb199d36f848104254a529e19a6cf8ef
2015-03-31 02:34:04 -05:00
Doug Wiegley
ccecb6ea26 Sync with oslo-incubator, tweak as needed
Change-Id: Ice3cfd55ebdfc0b1355ecbb48d42c123cdb743bb
2015-03-30 18:06:47 -06:00
Jenkins
bbf208633b Merge "Jinja Haproxy templates" 2015-03-27 21:08:13 +00:00
Kiall Mac Innes
278a39ecf7 Add tox -ecover environment
Change-Id: Ifb07bb6e7240d8d8a116baa17cb89ced647c128b
2015-03-27 16:12:38 +00:00
Jenkins
b435b50e4c Merge "Create database models for healthmanager" 2015-03-26 21:59:49 +00:00
Jenkins
aaebb084a2 Merge "Add the config file for nova compute drive" 2015-03-26 19:25:13 +00:00
Jenkins
2e400f0610 Merge "Fixes some inconsistencies" 2015-03-26 19:24:12 +00:00