From 89dc874f6f510a8f8193d34bde1bcff976e9ac86 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 14 Dec 2012 22:23:09 -0800 Subject: [PATCH] rat: Fix license on recently added new files in tools/devcloud Signed-off-by: Rohit Yadav --- pom.xml | 4 ++++ tools/devcloud/.rvmrc | 7 ------ tools/devcloud/src/.rvmrc | 24 +++++++++++++++++++ tools/devcloud/src/Gemfile | 19 ++++++++++++++- tools/devcloud/src/boxit.sh | 16 +++++++++++++ tools/devcloud/src/deps/boxer.sh | 16 +++++++++++++ .../src/deps/boxes/basebox-build/.rvmrc | 17 +++++++++++++ .../src/deps/boxes/basebox-build/Gemfile | 17 +++++++++++++ .../src/deps/boxes/basebox-build/Vagrantfile | 17 +++++++++++++ .../deps/boxes/basebox-build/definition.rb | 1 - .../src/deps/boxes/xenbox-build/.rvmrc | 17 +++++++++++++ .../src/deps/boxes/xenbox-build/Gemfile | 17 +++++++++++++ .../manifests/vagrant-devcloudinitial.pp | 17 +++++++++++++ .../devcloudinitial/files/network.conf | 16 +++++++++++++ .../puppet/modules/devcloud/files/compare.sh | 18 +++++++++++++- .../modules/devcloud/lib/facter/xeninfo.rb | 19 ++++++++++++++- .../manifests/functions/httpdownload.pp | 19 ++++++++++++++- .../modules/devcloud/manifests/params.pp | 17 +++++++++++++ tools/devcloud/src/waitforxe.sh | 18 +++++++++++++- 19 files changed, 283 insertions(+), 13 deletions(-) delete mode 100644 tools/devcloud/.rvmrc create mode 100644 tools/devcloud/src/.rvmrc diff --git a/pom.xml b/pom.xml index e5aa024b5ac..4d31cded68c 100644 --- a/pom.xml +++ b/pom.xml @@ -208,8 +208,12 @@ CHANGES INSTALL.md + .idea/ + *.log + **/*.patch **/.classpath **/.project + **/*.iml **/.settings/** .metadata/** .git/** diff --git a/tools/devcloud/.rvmrc b/tools/devcloud/.rvmrc deleted file mode 100644 index fa4f7ad16e9..00000000000 --- a/tools/devcloud/.rvmrc +++ /dev/null @@ -1,7 +0,0 @@ -rvm use ruby-1.9.3@vagrant-xen-cloudstack --create -export VAGRANT_HOME=$HOME/.vagrant.d-xen-cloudstack -bundle check > /dev/null 2>&1 -RETVAL=$? -if [ $RETVAL -ne 0 ]; then - bundle install -fi diff --git a/tools/devcloud/src/.rvmrc b/tools/devcloud/src/.rvmrc new file mode 100644 index 00000000000..7e51d62af9f --- /dev/null +++ b/tools/devcloud/src/.rvmrc @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + +rvm use ruby-1.9.3@vagrant-xen-cloudstack --create +export VAGRANT_HOME=$HOME/.vagrant.d-xen-cloudstack +bundle check > /dev/null 2>&1 +RETVAL=$? +if [ $RETVAL -ne 0 ]; then + bundle install +fi diff --git a/tools/devcloud/src/Gemfile b/tools/devcloud/src/Gemfile index bcc33100867..2790c4a52a0 100644 --- a/tools/devcloud/src/Gemfile +++ b/tools/devcloud/src/Gemfile @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + source 'https://rubygems.org' -gem 'vagrant', :git => 'https://github.com/chipchilders/vagrant' \ No newline at end of file +gem 'vagrant', :git => 'https://github.com/chipchilders/vagrant' diff --git a/tools/devcloud/src/boxit.sh b/tools/devcloud/src/boxit.sh index ccf28c630b0..dae53cee6bc 100755 --- a/tools/devcloud/src/boxit.sh +++ b/tools/devcloud/src/boxit.sh @@ -1,4 +1,20 @@ #! /bin/bash -ex +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. vagrant halt vagrant package default --output devcloud.box diff --git a/tools/devcloud/src/deps/boxer.sh b/tools/devcloud/src/deps/boxer.sh index 29b3cb2a5f4..72d9cd1e6f3 100755 --- a/tools/devcloud/src/deps/boxer.sh +++ b/tools/devcloud/src/deps/boxer.sh @@ -1,4 +1,20 @@ #! /bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. # Load RVM into a shell session *as a function* if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then diff --git a/tools/devcloud/src/deps/boxes/basebox-build/.rvmrc b/tools/devcloud/src/deps/boxes/basebox-build/.rvmrc index cbeb6281d13..3c8c66c97f9 100644 --- a/tools/devcloud/src/deps/boxes/basebox-build/.rvmrc +++ b/tools/devcloud/src/deps/boxes/basebox-build/.rvmrc @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + rvm use ruby-1.9.3@vagrant-release-cloudstack --create export VAGRANT_HOME=$HOME/.vagrant.d-release-cloudstack bundle check > /dev/null 2>&1 diff --git a/tools/devcloud/src/deps/boxes/basebox-build/Gemfile b/tools/devcloud/src/deps/boxes/basebox-build/Gemfile index 1649e855b40..dae53be6dd0 100644 --- a/tools/devcloud/src/deps/boxes/basebox-build/Gemfile +++ b/tools/devcloud/src/deps/boxes/basebox-build/Gemfile @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + source 'https://rubygems.org' gem 'veewee', :git => 'https://github.com/jedi4ever/veewee.git' gem 'em-winrm' diff --git a/tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile b/tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile index e69de29bb2d..245692337bc 100644 --- a/tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile +++ b/tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + diff --git a/tools/devcloud/src/deps/boxes/basebox-build/definition.rb b/tools/devcloud/src/deps/boxes/basebox-build/definition.rb index a7f90714243..24668421c5d 100644 --- a/tools/devcloud/src/deps/boxes/basebox-build/definition.rb +++ b/tools/devcloud/src/deps/boxes/basebox-build/definition.rb @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. - Veewee::Session.declare({ :cpu_count => '1', :memory_size=> '2048', diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc b/tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc index fa4f7ad16e9..7e51d62af9f 100644 --- a/tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc +++ b/tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + rvm use ruby-1.9.3@vagrant-xen-cloudstack --create export VAGRANT_HOME=$HOME/.vagrant.d-xen-cloudstack bundle check > /dev/null 2>&1 diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/Gemfile b/tools/devcloud/src/deps/boxes/xenbox-build/Gemfile index 8eab1c70eea..2790c4a52a0 100644 --- a/tools/devcloud/src/deps/boxes/xenbox-build/Gemfile +++ b/tools/devcloud/src/deps/boxes/xenbox-build/Gemfile @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + source 'https://rubygems.org' gem 'vagrant', :git => 'https://github.com/chipchilders/vagrant' diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp index 4f7cfb5b8da..0d48071536a 100644 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp +++ b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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 permission s and limitations +# under the License. + node default { include devcloudinitial } diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf index 7096907a5ff..91dd7437981 100644 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf +++ b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. bridge diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/compare.sh b/tools/devcloud/src/puppet/modules/devcloud/files/compare.sh index e1667c1ee62..e0ee95ca077 100644 --- a/tools/devcloud/src/puppet/modules/devcloud/files/compare.sh +++ b/tools/devcloud/src/puppet/modules/devcloud/files/compare.sh @@ -1,6 +1,22 @@ #! /bin/bash -eux +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. FILE=$1 WORKING_DIR=$2 cd $WORKING_DIR -test `grep $FILE ${WORKING_DIR}/md5sum.txt | awk '{print $1}'` == `md5sum $FILE |awk '{print $1}'` \ No newline at end of file +test `grep $FILE ${WORKING_DIR}/md5sum.txt | awk '{print $1}'` == `md5sum $FILE |awk '{print $1}'` diff --git a/tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb b/tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb index b174937e3be..a0b8748577a 100644 --- a/tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb +++ b/tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb @@ -1,5 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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 permission s and limitations +# under the License. + Facter.add(:xen_hostuuid) do setcode do uuid=Facter::Util::Resolution.exec('xe host-list |grep uuid|awk \'{print $5}\'') end -end \ No newline at end of file +end diff --git a/tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp b/tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp index 5e3db33c25f..2a88771beee 100644 --- a/tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp +++ b/tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp @@ -1,4 +1,21 @@ - define devcloud::functions::httpdownload () { +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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 permission s and limitations +# under the License. + +define devcloud::functions::httpdownload () { $file="${name['basedir']}/${name['basefile']}" exec { diff --git a/tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp b/tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp index 836263a9a45..ff625c176f3 100644 --- a/tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp +++ b/tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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 permission s and limitations +# under the License. + # == Class: devcloud::params # # This class implements the module params pattern, but it's loaded using hiera diff --git a/tools/devcloud/src/waitforxe.sh b/tools/devcloud/src/waitforxe.sh index d59518fe420..637b9fc92c9 100755 --- a/tools/devcloud/src/waitforxe.sh +++ b/tools/devcloud/src/waitforxe.sh @@ -1,4 +1,21 @@ #! /bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + date interval=20 timeout=300 @@ -7,7 +24,6 @@ command="xe host-list" count=0 maxcount=$(($timeout/$interval)) - until [ $count -gt $maxcount ]; do if $command > /dev/null 2>&1; then echo "\"$command\" executed successfully."