Do not define service resource when service management is disabled
Change-Id: I63c9c6c4df6cc0968a704546453416431b0fca07
This commit is contained in:
		@@ -336,15 +336,15 @@ class ec2api::api (
 | 
			
		||||
    } else {
 | 
			
		||||
      $service_ensure = 'stopped'
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  service { 'openstack-ec2-api-service' :
 | 
			
		||||
    ensure     => $service_ensure,
 | 
			
		||||
    name       => $service_name,
 | 
			
		||||
    enable     => $enabled,
 | 
			
		||||
    hasstatus  => true,
 | 
			
		||||
    hasrestart => true,
 | 
			
		||||
    tag        => 'ec2api-service',
 | 
			
		||||
    service { 'openstack-ec2-api-service' :
 | 
			
		||||
      ensure     => $service_ensure,
 | 
			
		||||
      name       => $service_name,
 | 
			
		||||
      enable     => $enabled,
 | 
			
		||||
      hasstatus  => true,
 | 
			
		||||
      hasrestart => true,
 | 
			
		||||
      tag        => 'ec2api-service',
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -125,15 +125,15 @@ class ec2api::metadata (
 | 
			
		||||
    } else {
 | 
			
		||||
      $service_ensure = 'stopped'
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  service { 'openstack-ec2-metadata-service' :
 | 
			
		||||
    ensure     => $service_ensure,
 | 
			
		||||
    name       => $service_name,
 | 
			
		||||
    enable     => $enabled,
 | 
			
		||||
    hasstatus  => true,
 | 
			
		||||
    hasrestart => true,
 | 
			
		||||
    tag        => 'ec2api-service',
 | 
			
		||||
    service { 'openstack-ec2-metadata-service' :
 | 
			
		||||
      ensure     => $service_ensure,
 | 
			
		||||
      name       => $service_name,
 | 
			
		||||
      enable     => $enabled,
 | 
			
		||||
      hasstatus  => true,
 | 
			
		||||
      hasrestart => true,
 | 
			
		||||
      tag        => 'ec2api-service',
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user