Skip to content

Commit 7c56a81

Browse files
James Martinyadvr
James Martin
authored and
yadvr
committed
devcloud: Fixed regression for network.conf commit 97fe053
Fixes regression for network.conf, commit: commit 97fe053 Author: Chip Childers <chip.childers@gmail.com> 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 <bhaisaab@apache.org>
1 parent ba30500 commit 7c56a81

2 files changed

Lines changed: 1 addition & 18 deletions

File tree

  • tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial

‎tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/network.conf‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
'/etc/xcp/network.conf':
5858
ensure => 'file',
5959
require => Package['xcp-xapi'],
60-
source => 'puppet:///modules/devcloudinitial/network.conf',
60+
content => "bridge",
6161
group => '0',
6262
mode => '0644',
6363
owner => '0';

0 commit comments

Comments
 (0)