diff options
| -rw-r--r-- | build/Makefile | 11 | ||||
| -rw-r--r-- | build/rpm_specs/gluon.spec | 9 | ||||
| -rwxr-xr-x | ci/build-gluon-packages.sh | 9 | ||||
| -rw-r--r-- | deploy/puppet/gluon/manifests/config.pp | 9 | ||||
| -rw-r--r-- | deploy/puppet/gluon/manifests/init.pp | 9 | ||||
| -rw-r--r-- | deploy/puppet/gluon/manifests/install.pp | 9 | ||||
| -rw-r--r-- | deploy/puppet/gluon/manifests/params.pp | 9 | ||||
| -rw-r--r-- | deploy/puppet/gluon/manifests/service.pp | 9 | ||||
| -rw-r--r-- | docs/development/requirements/conf.py | 22 | ||||
| -rwxr-xr-x | test/functest/gluon-test-suite.py | 10 |
10 files changed, 91 insertions, 15 deletions
diff --git a/build/Makefile b/build/Makefile index 46e576f..01db0c1 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,7 +1,16 @@ +# +# Copyright (c) 2016 Ericsson 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 +# OPNFV_RELEASE=$(shell echo $(shell date -u +"%Y%m%d")) GLUON_REPO=https://github.com/openstack/gluon.git GLUON_BRANCH=master -GLUON_VER=$(shell grep Version $(shell pwd)/rpm_specs/gluon.spec | head -n 1 | awk '{ print $$2 }') +GLUON_VER=$(shell grep '^Version:' $(shell pwd)/rpm_specs/gluon.spec | head -n 1 | awk '{ print $$2 }') GLUON_REL=$(shell grep 'define release' $(shell pwd)/rpm_specs/gluon.spec | head -n 1 | awk '{ print $$3 }')_$(OPNFV_RELEASE) GLUON_TAR=gluon.tar.gz GLUON_RPM=noarch/gluon-$(GLUON_VER)-$(GLUON_REL).noarch.rpm diff --git a/build/rpm_specs/gluon.spec b/build/rpm_specs/gluon.spec index 6e39ab4..cbc14ba 100644 --- a/build/rpm_specs/gluon.spec +++ b/build/rpm_specs/gluon.spec @@ -1,3 +1,12 @@ +# +# Copyright (c) 2016 Ericsson 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 +# %define release 1 %define _sharedstatedir /var/lib %define build_timestamp %(date +"%Y%m%d") diff --git a/ci/build-gluon-packages.sh b/ci/build-gluon-packages.sh index b35b5b8..cb9f327 100755 --- a/ci/build-gluon-packages.sh +++ b/ci/build-gluon-packages.sh @@ -1,4 +1,13 @@ #!/bin/bash +# +# Copyright (c) 2017 Ericsson 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 -o errexit set -o nounset set -o pipefail diff --git a/deploy/puppet/gluon/manifests/config.pp b/deploy/puppet/gluon/manifests/config.pp index 1f92843..ded90c6 100644 --- a/deploy/puppet/gluon/manifests/config.pp +++ b/deploy/puppet/gluon/manifests/config.pp @@ -1,3 +1,12 @@ +# +# Copyright (c) 2017 Ericsson 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 +# class gluon::config { file { '/etc/proton/proton-shim.conf': diff --git a/deploy/puppet/gluon/manifests/init.pp b/deploy/puppet/gluon/manifests/init.pp index 0225533..d814601 100644 --- a/deploy/puppet/gluon/manifests/init.pp +++ b/deploy/puppet/gluon/manifests/init.pp @@ -1,3 +1,12 @@ +# +# Copyright (c) 2017 Ericsson 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 +# class gluon inherits ::gluon::params { $bind_ip = $::gluon::params::bind_ip diff --git a/deploy/puppet/gluon/manifests/install.pp b/deploy/puppet/gluon/manifests/install.pp index 234da49..139721d 100644 --- a/deploy/puppet/gluon/manifests/install.pp +++ b/deploy/puppet/gluon/manifests/install.pp @@ -1,3 +1,12 @@ +# +# Copyright (c) 2017 Ericsson 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 +# class gluon::install { package { 'python-click': diff --git a/deploy/puppet/gluon/manifests/params.pp b/deploy/puppet/gluon/manifests/params.pp index d5ea6f6..8695b11 100644 --- a/deploy/puppet/gluon/manifests/params.pp +++ b/deploy/puppet/gluon/manifests/params.pp @@ -1,3 +1,12 @@ +# +# Copyright (c) 2017 Ericsson 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 +# class gluon::params { $bind_ip = '127.0.0.1' diff --git a/deploy/puppet/gluon/manifests/service.pp b/deploy/puppet/gluon/manifests/service.pp index b909d54..5ee02e3 100644 --- a/deploy/puppet/gluon/manifests/service.pp +++ b/deploy/puppet/gluon/manifests/service.pp @@ -1,3 +1,12 @@ +# +# Copyright (c) 2017 Ericsson 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 +# class gluon::service { service { 'openstack-proton-server': diff --git a/docs/development/requirements/conf.py b/docs/development/requirements/conf.py index 9912324..df225d2 100644 --- a/docs/development/requirements/conf.py +++ b/docs/development/requirements/conf.py @@ -1,21 +1,17 @@ -# Copyright 2016 Open Platform for NFV Project, Inc. and its contributors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# +# +# Copyright (c) 2016 Ericsson 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# + # # What this is: Configuration file for OPNFV NetReady requirements # documentation based on the configuration file used by the Copper project. # - import datetime import sys import os diff --git a/test/functest/gluon-test-suite.py b/test/functest/gluon-test-suite.py index 2214be6..e262ced 100755 --- a/test/functest/gluon-test-suite.py +++ b/test/functest/gluon-test-suite.py @@ -1,5 +1,13 @@ #!/usr/bin/python - +# +# Copyright (c) 2017 Ericsson 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 +# from opnfv.deployment import factory import functest.utils.openstack_utils as osutils import functest.utils.functest_logger as ft_logger |