diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-01-23 03:37:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-23 03:37:43 +0000 |
| commit | bfb1e6dfdf3e797eb068b0c546a8f9034e1f680e (patch) | |
| tree | ae77a32aae938d7ac4c25d969cdab0d3cd5ec4cf | |
| parent | e9fb28151722877c73a335797fb1498a96c764c7 (diff) | |
| parent | dd0f55aa5ec077767421e22de41e7448189f62c3 (diff) | |
Merge "Adds licenses and fixes ODL L3"
| -rw-r--r-- | INFO | 9 | ||||
| -rwxr-xr-x | build/instack.sh | 8 | ||||
| -rw-r--r-- | build/opnfv-tripleo-heat-templates.patch | 2 | ||||
| -rwxr-xr-x | ci/clean.sh | 8 | ||||
| -rwxr-xr-x | ci/deploy.sh | 8 |
5 files changed, 34 insertions, 1 deletions
@@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + Project: Apex Project Creation Date: July 14, 2015 Project Category: Integration & Testing diff --git a/build/instack.sh b/build/instack.sh index 03dfd1ef..95feeba8 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -1,4 +1,12 @@ #!/bin/sh +############################################################################## +# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## set -e declare -i CNT diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch index c591b93a..ac06ae3d 100644 --- a/build/opnfv-tripleo-heat-templates.patch +++ b/build/opnfv-tripleo-heat-templates.patch @@ -114,7 +114,7 @@ index 0000000..ffdb017 +parameters: + #NeutronEnableL3Agent: false + NeutronEnableForceMetadata: true -+ OpenDaylightEnableL3: 'yes' ++ OpenDaylightEnableL3: "'yes'" + NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin" + ExtraConfig: + neutron_mechanism_drivers: ['opendaylight'] diff --git a/ci/clean.sh b/ci/clean.sh index 8125ec30..8b0c9bbc 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -1,4 +1,12 @@ #!/usr/bin/env bash +############################################################################## +# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## #Clean script to uninstall provisioning server for Apex #author: Dan Radez (dradez@redhat.com) diff --git a/ci/deploy.sh b/ci/deploy.sh index d96ebe4f..359bf659 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1,4 +1,12 @@ #!/bin/bash +############################################################################## +# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## # Deploy script to install provisioning server for OPNFV Apex # author: Dan Radez (dradez@redhat.com) |