mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-11-04 00:02:37 +01:00 
			
		
		
		
	devcloud: Fixed regression for network.conf commit 97fe053e2e
Fixes regression for network.conf, commit: commit 97fe053e2e1c3fbaf891f300809fa0b926a0ea89 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>
This commit is contained in:
		
							parent
							
								
									ba30500402
								
							
						
					
					
						commit
						7c56a81bdd
					
				@ -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
 | 
			
		||||
@ -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';
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user