openstack/fuel-library
Code Issues Proposed changes

Minor fixes

Browse Source
This commit is contained in:
vic 2013-02-23 04:16:04 +04:00
parent 8bd0a61367
commit 032a3ab3d4
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/l23network/manifests/l2/bridge.pp
View File

@ -26,8 +26,8 @@ define l23network::l2::bridge (
ensure => $ensure,
external_ids => $external_ids,
skip_existing=> $skip_existing,
require => Service<| title == 'openvswitch-service' |>,
}
Service<| title == 'openvswitch-service' |> -> L2_ovs_bridge[$name]
}
}

2
deployment/puppet/l23network/manifests/l2/port.pp
View File

@ -34,7 +34,7 @@ define l23network::l2::port (
bridge => $bridge,
type => $type,
skip_existing => $skip_existing,
require => Service<| title == 'openvswitch-service' |>,
}
Service<| title == 'openvswitch-service' |> -> L2_ovs_port[$name]
}
}

4
deployment/puppet/nova/manifests/generic_service.pp
View File

@ -41,8 +41,8 @@ define nova::generic_service(
name => $package_name,
ensure => $ensure_package,
}
Stdlib::Safe_package[$nova_title] -> Service[$nova_title]
Stdlib::Safe_package[$nova_title] ~> Service[$nova_title]
Package[$nova_title] -> Service[$nova_title]
Package[$nova_title] ~> Service[$nova_title]
}
if ($service_name) {

9
deployment/puppet/nova/manifests/metadata_api.pp
View File

@ -30,12 +30,13 @@ class nova::metadata_api (
Package['nova-metadata-api'] -> Nova_config<||>
Nova_config<||> ~> Service['nova-metadata-api']
stdlib::safe_package {'nova-metadata-api':
name => $::nova::params::meta_api_package_name,
ensure => present,
if ! defined(Package['nova-metadata-api']) {
package {'nova-metadata-api':
name => $::nova::params::meta_api_package_name,
ensure => present,
}
}
service { 'nova-metadata-api':
name => $::nova::params::meta_api_service_name,
ensure => 'running',

2
deployment/puppet/quantum/manifests/plugins/ovs/bridge.pp
View File

@ -2,7 +2,7 @@ define quantum::plugins::ovs::bridge {
$mapping = split($name, ":")
$bridge = $mapping[1]
if !defined(l23network::l2::bridge[$bridge]) {
if !defined(L23network::L2::Bridge[$bridge]) {
l23network::l2::bridge {$bridge:
ensure => present,
external_ids => "bridge-id=${bridge}",

2
deployment/puppet/quantum/manifests/plugins/ovs/port.pp
View File

@ -3,7 +3,7 @@ define quantum::plugins::ovs::port {
$bridge = $mapping[0]
$port = $mapping[1]
if !defined(l23network::l2::port[$port]) {
if !defined(L23network::L2::Port[$port]) {
l23network::l2::port {$port:
ensure => present,
bridge => $bridge,