Updated Branches: refs/heads/master ba3050040 -> 7c56a81bd
devcloud: Fixed regression for network.conf commit 97fe053e2e Fixes regression for network.conf, commit: commit 97fe053e2e1c3fbaf891f300809fa0b926a0ea89 Author: Chip Childers <[email protected]> Date: Mon Aug 13 11:12:01 2012 -0400 Removed ASF license header from network.conf, because XCP doesn't respect comment lines in this file This seemed to have been re-introduced during the merge in of my patch. This file has no been removed completely and is created in-line through the puppet module. Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7c56a81b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7c56a81b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7c56a81b Branch: refs/heads/master Commit: 7c56a81bddf4eeefe8989864f2c48a7dbb484297 Parents: ba30500 Author: James Martin <[email protected]> Authored: Mon Dec 17 15:52:15 2012 -0500 Committer: Rohit Yadav <[email protected]> Committed: Mon Dec 17 13:16:32 2012 -0800 ---------------------------------------------------------------------- .../modules/devcloudinitial/files/network.conf | 17 --------------- .../modules/devcloudinitial/manifests/init.pp | 2 +- 2 files changed, 1 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c56a81b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf ---------------------------------------------------------------------- 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 deleted file mode 100644 index 91dd743..0000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf +++ /dev/null @@ -1,17 +0,0 @@ -# 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 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c56a81b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp index ee58a71..e1f4c5a 100644 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp +++ b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp @@ -57,7 +57,7 @@ class devcloudinitial { '/etc/xcp/network.conf': ensure => 'file', require => Package['xcp-xapi'], - source => 'puppet:///modules/devcloudinitial/network.conf', + content => "bridge", group => '0', mode => '0644', owner => '0';
