summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-02Merge "fix 'unary operator expected' in conditional expression" into ↵Tim Rozet1-13/+13
stable/brahmaputra
2016-02-02fix 'unary operator expected' in conditional expressionRyota MIBU1-13/+13
Change-Id: I6c8bd9a949b1b818bedd4994f490da4a703ee6a5 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com> (cherry picked from commit 3dd004f69a66c917d1ec799b448817d5efade357)
2016-02-02Updating directory structure to add files to the central docs.ChristopherPrice5-44/+46
Moved the introduction and baremetal installation instructions to /configguide. The files baremetal and introduction will be pulled into the central config guide document for release. (A little local file name juggling was required to accommodate the toolchain.) Once merged this should be pulled into the configguide. Will work on a patch for that now. Change-Id: Ie270154d0c7ac418b693ac7cf6e1444a33023266 Signed-off-by: ChristopherPrice <christopher.price@ericsson.com> (cherry picked from commit 5cfe9f9299ab1bc39401b11f780c1eef8e425677)
2016-02-01Fixes missing image for nosdn deploymentsTim Rozet1-0/+1
Note this image could change from opendaylight to a regular overcloud image if we choose to split out a nosdn rpm in the future. For now fallback to the ODL image. JIRA: APEX-78 Change-Id: I959d917330b1d8f68c16c3d122901494112db071 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 910f7c156549c14d3e635eab2707c87790116439)
2016-01-30Changes to make SFC deployments functionalTim Rozet4-55/+147
Fixes include: - sfc deployments now are non-HA, and disable swift and ringbuilder as it causes issues with the 3.13 kernel - ODL Features boot is now parameterized in heat templates - SFC features boot is now set to "odl-ovsdb-sfc-rest" - Coexistence table offsets included if SFC deployment - VXLAN workaround applied for 123.123.123.x subnet if SFC Change-Id: Ide5e0b451adcb98c417e57628a51302f3123647f Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 13984a4de5090f961b2cf2c1923ffa72f1488343)
2016-01-29Fixes bug where ha_enabled was detected as false when set trueTim Rozet1-3/+3
Daily failed because, we removed the default value of "TRUE" for ha_enabled, and deploy settings sets it as "true", which we were not looking for as a boolean in deploy. This patch fixes that. Change-Id: I03ac599aa2a35ae494e13f9293aef273ab3051e9 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-29Merge "Aodh fixes"Tim Rozet3-43/+231
2016-01-29Merge "Various fixes and improvements"Tim Rozet2-6/+55
2016-01-29Aodh fixesMichael Chapman3-43/+231
instack.sh: Patch puppet-tripleo to include aodh loadbalancing tripleo-heat-templates: Remove ceilometer services that are replaced by aodh Add rabbit_hosts to aodh config Add ceilometer config file that was missing Add nobody group to aodh user Change-Id: Ie25cdbf44fc7f23bd65a0af23358b24e3032ea81
2016-01-28Merge "Fixes cinder keystone auth"Dan Radez2-11/+29
2016-01-28Various fixes and improvementsTim Rozet2-6/+55
Changes Include: - New Interactive mode. Allows you to pause deployments in order to make changes before continuing (or exit and deploy manually). Useful when needing to modify NIC order for baremetal deployments. - deploy_settings -d is now required. - ha_enabled no longer defaults to true. It can be specified in deploy_settings or overridden with via command line. - compute nodes now scale correctly with what is defined by inventory JIRA: APEX-70 APEX-71 APEX-72 Change-Id: Id45808f4d0435d66f12c020bd4455faaa43da191 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-28Merge "Fixes various bugs and adds some improvements"Dan Radez5-15/+53
2016-01-28Fixes cinder keystone authTim Rozet2-11/+29
URI was being passed incorrectly by tht JIRA: APEX-59 Change-Id: If9912f1ef0618836f37931e3573293d0f434d23f Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-27Fixes various bugs and adds some improvementsTim Rozet5-15/+53
Changes Include: - Disables introspection. We don't currently use introspection for anything other than to just run it. Disabling it to increase deploy speed and reduce pxeboot issues. - Adds timeout to deploy of 90 minutes. Default heat timeout is 3-4 hours. - Fixes OVS bridge attach/detach for users who use PREFIX in their ifcfg instead of NETMASK - Adds nosdn deploy settings file, and allows nosdn deployments - Adds example inventory file to the docs dir Change-Id: Ic13d6c4d5f27bac25365e5951acdd9bd3e641a15 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-28Fixes ODL installing in SFCTim Rozet1-1/+3
JIRA: APEX-66 Change-Id: If53470930e5b982ad172711f89dcdcfd7c5eec57 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-27Allows ONOS to use compute nodes with br-ex no IPTim Rozet8-2/+446
ONOS needs the capability to have br-ex on compute nodes with no IP for L3 functionality to work correctly on baremetal. This patch allows that capability, and makes it default behavior (sdn_l3 true). If desired, a user can set sdn_l3 to false, and compute nodes public interface will be a regular interface with no IP for ONOS deployments. JIRA: APEX-64 Change-Id: I578b946edbddf7fc9c29363c78fec2c3ada48cf6 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-26Patches keystone endpoint setup to include AodhTim Rozet5-11/+123
Note this behavior has changed in TripleO post Brahmaputra. The endpoints and services are created in THT rather than hardcoded in tripleoclient. JIRA: APEX-65 Change-Id: Ie595f2778fb509213e2992bf1ef60df82cf22666 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-26Merge "Fixes ONOS external network"Tim Rozet7-0/+405
2016-01-25Fixes ONOS external networkTim Rozet7-0/+405
ONOS public network needs to not have IPs on the compute nodes' public interface. JIRA: APEX-64 Change-Id: I0d4d97b1b7dcaa39395940da03ae6b19f1dd9eb0 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-25Add Aodh IP to network environmentMichael Chapman1-0/+1
Change-Id: Ie34926c9379b62d53f0008db684dda0f3737273a
2016-01-23Merge "fixes to initial sfc code"brahmaputra.1.rc1Tim Rozet1-3/+36
2016-01-23Merge "Adds licenses and fixes ODL L3"Dan Radez5-1/+34
2016-01-22fixes to initial sfc codeDan Radez1-3/+36
- xfs grow bug workaround - using 3.0.0 tag of puppet-opendaylight - update installation procedure for OVS-NSH JIRA: APEX-46 JIRA: APEX-48 Change-Id: I2a8cf5430a325c03a75b27fd05a011aa82f6c755
2016-01-22Adds licenses and fixes ODL L3Tim Rozet5-1/+34
JIRA: APEX-62 Change-Id: Ide34d9971cd6ac987b5994f5e23b4cfa58f92b29 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-22adding nf_conntrack_proto_sctp to modules-loadDan Radez2-3/+4
JIRA: APEX-63 Change-Id: I4155111eb2c19d74e0f265ccac25756f35bb41a0
2016-01-22Merge "adding SFC overcloud image"Tim Rozet5-45/+131
2016-01-21adding SFC overcloud imageDan Radez5-45/+131
JIRA: APEX-46 JIRA: APEX-48 Change-Id: Ic2a0d9035429c5887d10f60febacff63dd2eeb5e
2016-01-21Fixes enabling L3 ODL incorrectlyTim Rozet1-1/+1
Param was set to true when it should have been 'yes' JIRA: APEX-62 Change-Id: I9f9ca3461f3730e5fcf470249e872f71ae3ba938 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-21AodhMichael Chapman2-42/+497
Add support for Aodh. Current packaged module is out of date and the module is very young, so it is pulled from git on liberty branch. Change-Id: Iff72c8b63970021e212bb9d78f9a805d108f0bcf
2016-01-20Fixes cinder quota failures by using correct keystone authTim Rozet2-0/+28
JIRA: APEX-59 Change-Id: I0eca415c30cc3fa2377bed3dfc640cc71da3dae7 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-20Merge "Restructured the installation-instruction file into indexed sub files"Tim Rozet11-542/+530
2016-01-20Restructured the installation-instruction file into indexed sub filesChristopherPrice11-542/+530
Take-two of this patch, originally merged: f479b77c4f7c0d11196e3902bb7e60ff8e34a1fe reverted: bffb8e0e27f21934a4bbb1138427f2adda6c583d Created a section based structure for the installation-instruction. It should show on the html artifact as a structured web page. We may want to move some sections to other directories to incorporate them into the release configguide. Left that for step 2... Now includes updates to the rpm spec so as not to break the build. Change-Id: I7c0d46467de668883fcd29ae7deaa20151bacdb2 Signed-off-by: ChristopherPrice <christopher.price@ericsson.com> Signed-off-by: Dan Radez <dradez@redhat.com>
2016-01-20Fixes external br-ex mapping for L3 agentTim Rozet1-1/+1
We were accidentally setting the external default bridge to "" in l3_agent.ini. This was causing external router interfaces to be placed on br-int instead of br-ex. Note: this behavior changes in Mitaka JIRA: APEX-61 Change-Id: Icbb2ba433a012d0e8771b7d82dec64464e526c7a Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-20Merge "Revert "Restructured the installation-instruction file into indexed ↵Tim Rozet10-527/+539
sub files""
2016-01-20Revert "Restructured the installation-instruction file into indexed sub files"Tim Rozet10-527/+539
This reverts commit f479b77c4f7c0d11196e3902bb7e60ff8e34a1fe. Change-Id: I02b0d6e9f802765fe5a773547b8c43a10b260755
2016-01-19Merge "Fixes ODL L3 so that it now deploys correctly"Dan Radez2-7/+10
2016-01-19Merge "Restructured the installation-instruction file into indexed sub files"Dan Radez10-539/+527
2016-01-19Fixes ODL L3 so that it now deploys correctlyTim Rozet2-7/+10
Fixes: - opendaylight was not being installed on controllers due to missing param - controller nics were not being found due to using computes extension of br-ex for ODL L3 (controllers have br-ex by default) Change-Id: Ic1b6d57fe162194030607856120a742dbed1e9e2 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-17Adds ODL L3 and external network support on compute nodesTim Rozet15-68/+788
Adds support for ODL L3 which uses DVR (distributed virtual routing). Due to DVR compute nodes must have br-ex. In addition, neutron must force metadata via dhcp agent, since there is no neutron L3 agent running. ODL L3 runs as custom plugin to neutron. Also adds support for configuring IP on public NIC now by default. This is needed for ONOS deployment, and access via public interface. Change-Id: I5df0e49bd903efacf8c87486da27576b01ce5779 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-16add step to execute gw_mac_update.sh after apex deployedbob4-0/+98
Change-Id: I47c316e26ff8e597c781562645397335e8c5bd70 Signed-off-by: bob zhou <bob.zh@huawei.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-16bug fix of onos deployment failedbob_zhou1-1/+2
change folder name of onos puppet to fix file not found error. Change-Id: I6cdee189e43c66ec8a49bbf736a6c28763638880 Signed-off-by: bob_zhou <bob.zh@huawei.com>
2016-01-15Restructured the installation-instruction file into indexed sub filesChristopherPrice10-539/+527
Created a section based structure for the installation-instruction. It should show on the html artifact as a structured web page. We may want to move some sections to other directories to incorporate them into the release configguide. Left that for step 2... Change-Id: I4e2b4f398cbb0f4203166af68520ce4ecd82a328 Signed-off-by: ChristopherPrice <christopher.price@ericsson.com>
2016-01-15Merge "Adds scenario deploy settings files"Dan Radez8-4/+64
2016-01-15Adds scenario deploy settings filesTim Rozet8-4/+64
Changes include: - Scenarios for opencontrail, onos, sfc, odl l2/l3 - Minor fix to error print statement - Post Config is now disabled when using --flat Change-Id: I5f3686dda4c4a573b1777916669053593852676a Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-01-15fix onos package bugbob1-1/+1
Change-Id: I5994159ec3c48ed1bf66a5d90efd1d3c0800cc0e Signed-off-by: bob zhou <bob.zh@huawei.com>
2016-01-15splitting rpm into multiple rpmsDan Radez4-94/+186
- code in the common rpm - instack in the instack rpm - undercloud in an rpm that will be named per sdn in the future Change-Id: I969277daf87f67da6934cad7268c96efda6960c7
2016-01-14version cleanup and increment for Bramaputra ReleaseDan Radez1-8/+10
Change-Id: I2df7f498aad507e155ce6a4ba1cf20b75d0e67b9
2016-01-14Merge "Deploy failed due to .ssh already existing"brahmaputra.1.rc0Dan Radez1-1/+1
2016-01-14Deploy failed due to .ssh already existingMichael Chapman1-1/+1
In a local test, I observed virt-customize failing during ssh key injection Injecting ssh key to instack VM [ 0.0] Examining the guest ... [ 48.0] Setting a random seed [ 48.0] Running: mkdir /root/.ssh/ mkdir: cannot create directory '/root/.ssh/': File exists virt-customize: mkdir /root/.ssh/: command exited with an error Adding -p should prevent this from happening. Change-Id: If8f085cba3083ccf3d5e8f648a9830f142ea53d9
2016-01-13Fixes attaching networks for baremetal only to admin/publicTim Rozet2-2/+5
We should only bridge to admin/public for baremetal deployments. There is no reason for us to bridge to the private or storage networks on instack for deployment. Also fixes OpenDaylight to Lithium 3.3 Change-Id: I2eb8f83ddbcb69d3219e7927025b46dcb9550ba9 Signed-off-by: Tim Rozet <trozet@redhat.com>