summary |
shortlog | log |
commit |
commitdiff |
review |
tree
first ⋅ prev ⋅ next
Luis Gomez [Thu, 12 Dec 2013 04:44:34 +0000 (04:44 +0000)]
Merge "Updating the Base and Virtualization editions with the latest OVSDB Neutron and Northbound bundles"
Madhu Venugopal [Thu, 12 Dec 2013 02:56:10 +0000 (18:56 -0800)]
Updating the Base and Virtualization editions with the latest OVSDB Neutron and Northbound bundles
Change-Id: Idd68daf10d1fe3125148084578441bca21d5ac09
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Ed Warnicke [Thu, 12 Dec 2013 02:55:33 +0000 (02:55 +0000)]
Merge "Non-intrusive option to select one of the 3 virtualization technologies supported in Hydrogen release : opendove, ovsdb, vtn."
Madhu Venugopal [Thu, 12 Dec 2013 01:27:53 +0000 (17:27 -0800)]
Non-intrusive option to select one of the 3 virtualization technologies supported in Hydrogen release : opendove, ovsdb, vtn.
The basic idea is to make use of the Apache Felix FileInstall to filter out the excluded technology.
In order to avoid introducing multiple config files and keep the changes contained in the Integration branch & Virtualization edition,
we decided to play with a maven assembly plugin option which essentially provides a way to wrap the root run.sh with a virtualization
edition's run.sh.
1. The root run.sh from the base edition is renamed to run.base.sh
2. Introduced a new run.sh (in assemble/resources folder - Note I didnt add it in main/resources to avoid conflicts)
which is essentially a wrapper for run.base.sh.
3. Maven Assembly plugin takes care of the rest with the <file> and <fileSet> changes.
Change-Id: I76554e60fd3360f6ceea2fec06c98897cac4b99b
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Robert Varga [Tue, 10 Dec 2013 20:24:34 +0000 (21:24 +0100)]
Fixup configuration to match base controller
Change-Id: I0a08a51a3cd59dc0beebecd2f0ddf21c91a3aea1
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 8 Dec 2013 17:38:45 +0000 (18:38 +0100)]
Update configuration files to match current expectations
Change-Id: I1e04ee2974be832b04849e2a712d636b1dccb9cf
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 8 Dec 2013 12:15:36 +0000 (13:15 +0100)]
Fix to match changes
Change-Id: I9b091627a885e870659efa4f170acec22130a149
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 3 Dec 2013 08:47:22 +0000 (09:47 +0100)]
Split the configuration into multiple files for clarity
Change-Id: I57b8bc744270cecca145023370c0df481ecde6fb
Signed-off-by: Robert Varga <rovarga@cisco.com>
Ed Warnicke [Mon, 2 Dec 2013 23:06:06 +0000 (23:06 +0000)]
Merge "Make sure bgpcep configuration is included"
Robert Varga [Sun, 1 Dec 2013 14:12:11 +0000 (15:12 +0100)]
Make sure bgpcep configuration is included
Change-Id: I5c45f2b8a38d9459efbcf37f3d12497ef5a2b2c4
Signed-off-by: Robert Varga <rovarga@cisco.com>
Ed Warnicke [Sun, 1 Dec 2013 13:47:25 +0000 (13:47 +0000)]
Merge "Import models required for proper BGP/PCEP operation"
Robert Varga [Sun, 1 Dec 2013 13:35:38 +0000 (14:35 +0100)]
Import models required for proper BGP/PCEP operation
Signed-off-by: Robert Varga <rovarga@cisco.com>
Ed Warnicke [Sun, 24 Nov 2013 21:42:18 +0000 (21:42 +0000)]
Merge "Update BGPCEP artifacts"
Robert Varga [Fri, 22 Nov 2013 12:03:31 +0000 (13:03 +0100)]
Update BGPCEP artifacts
Signed-off-by: Robert Varga <rovarga@cisco.com>
Baohua Yang [Sun, 17 Nov 2013 12:14:27 +0000 (20:14 +0800)]
Add *.swp files into the git ignore list.
Change-Id: I83df5404691888f405f7ca3b6d65d2067850e800
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
Baohua Yang [Sun, 17 Nov 2013 12:13:19 +0000 (20:13 +0800)]
Add *.pyc, log.html, output.xml and report.html to the ignore list.
Change-Id: I615d11eff75b5e811b37568bbca9be8404b15d0d
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
Luis Gomez [Fri, 15 Nov 2013 04:35:22 +0000 (20:35 -0800)]
test 3 Jenkins
Change-Id: Ia3b860a39c0c906320637fce02bcefb754f85fb0
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
Luis Gomez [Fri, 15 Nov 2013 01:46:17 +0000 (17:46 -0800)]
Jenkins Test 2
Change-Id: I81e25ddf7fe62220bf04d13ba12ef3a5625d0958
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
Hideyuki [Wed, 13 Nov 2013 08:00:28 +0000 (03:00 -0500)]
Add neutron bundle from VTN to the Virtualization
It adds neutron.manager bundle from VTN Project to the Virtualization
Edition for OpenStack Neutron API support.
Change-Id: I984db1e1629535a1f0371b179b9b8266433963c2
Signed-off-by: Hideyuki <h-tai@cd.jp.nec.com>
Ed Warnicke [Thu, 31 Oct 2013 18:56:51 +0000 (11:56 -0700)]
Adds OVSDB to Base - per TSC vote on Nov 7, 2013
Change-Id: I2b8bb22569077fc2c869f19a439b9dc0b93b9a77
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Alissa Bonas [Thu, 24 Oct 2013 11:00:02 +0000 (14:00 +0300)]
Add missing bgpcep dependencies to fix serviceprovider startup
Change-Id: I5a9f23d4df1cd4db1d825567a4148005b6816c14
Signed-off-by: Alissa Bonas <abonas@redhat.com>
Alissa Bonas [Wed, 23 Oct 2013 11:47:24 +0000 (14:47 +0300)]
Exclude defense4all jars from the plugins dir.
Change-Id: I3cd588f963e6fb4751ca37fb6819c14db4b0f61a
Signed-off-by: Alissa Bonas <abonas@redhat.com>
Ed Warnicke [Tue, 22 Oct 2013 18:36:18 +0000 (18:36 +0000)]
Merge "Fix file permissions to make it non-executable"
Alissa Bonas [Wed, 16 Oct 2013 17:54:06 +0000 (20:54 +0300)]
Enable defense4all dependencies in virtualization
Change-Id: I456971c6984f2d99529be53b676cf14cc4d0b9d3
Signed-off-by: Alissa Bonas <abonas@redhat.com>
Robert Varga [Thu, 17 Oct 2013 08:17:11 +0000 (10:17 +0200)]
Fix file permissions to make it non-executable
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
Ed Warnicke [Wed, 16 Oct 2013 14:24:53 +0000 (14:24 +0000)]
Merge "Fix missing dep odmc.rest in virtualization"
Alissa Bonas [Wed, 16 Oct 2013 13:09:55 +0000 (16:09 +0300)]
Fix missing dep odmc.rest in virtualization
Change-Id: Ibca1b1bd7e8d55d52e221b18c80cd243a9d7e3a1
Signed-off-by: Alissa Bonas <abonas@redhat.com>
Alissa Bonas [Wed, 16 Oct 2013 12:56:41 +0000 (15:56 +0300)]
Solve missing dep l2agent for affinity in serviceprovider
Change-Id: I01aa9a3f843462047aec17d333b11bc457050ab0
Signed-off-by: Alissa Bonas <abonas@redhat.com>
Ed Warnicke [Wed, 16 Oct 2013 12:47:44 +0000 (12:47 +0000)]
Merge "Fix typo in includeArtifactIds property in pom."
Alissa Bonas [Wed, 16 Oct 2013 12:27:18 +0000 (15:27 +0300)]
Add missing dep bgp-parser-spi to serviceprovider pom
Change-Id: Ib7049ad7fe743334e64eec0bcabb325ac3986633
Signed-off-by: Alissa Bonas <abonas@redhat.com>
Alissa Bonas [Tue, 15 Oct 2013 15:40:42 +0000 (18:40 +0300)]
Fix typo in includeArtifactIds property in pom.
Change-Id: I24f944cf2b1eaff4e670b76862e49d2c139e2b55
Signed-off-by: Alissa Bonas <abonas@redhat.com>
Ed Warnicke [Wed, 2 Oct 2013 21:00:34 +0000 (16:00 -0500)]
Added Distribution management to pom.xml
This is needed to allow artifact deployment and fix the merge
job.
Change-Id: Id30ede9d0523dde500d6fa50f78e719a7fb248da
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Ed Warnicke [Wed, 2 Oct 2013 20:38:22 +0000 (15:38 -0500)]
Added vtn bundles.
Change-Id: I478eb0340bf51d1bf9779bb55e4dfe86f5d9dcfd
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Ed Warnicke [Wed, 2 Oct 2013 04:15:43 +0000 (23:15 -0500)]
Initial commit of distributions (Base, Virtualization, Service Provider)
Change-Id: I6ef50dc5beb2394ee248c3f678210a58335b6ccd
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Code Review / integration / distribution.git / log