openstack/fuel-library
Code Issues Proposed changes

Fix standalone quantum node

Browse Source
This commit is contained in:
vic 2013-03-22 12:35:25 +04:00
parent b17a1fca58
commit f972adcc57
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ define nova::generic_service(
$nova_title = "nova-${name}" $nova_title = "nova-${name}"
# ensure that the service is only started after # ensure that the service is only started after
# all nova config entries have been set # all nova config entries have been set
Exec['post-nova_config'] ~> Service<| title == $nova_title |> Nova_config<| |> ~> Service<| title == $nova_title |>
# ensure that the service has only been started # ensure that the service has only been started
# after the initial db sync # after the initial db sync
Exec<| title == 'nova-db-sync' |> ~> Service<| title == $nova_title |> Exec<| title == 'nova-db-sync' |> ~> Service<| title == $nova_title |>
@ -59,8 +59,8 @@ define nova::generic_service(
name => $service_name, name => $service_name,
ensure => $service_ensure, ensure => $service_ensure,
enable => $enabled, enable => $enabled,
require => Package['nova-common'],
} }
Package<| title == 'nova-common' |> -> Service[$nova_title]
} }
} }

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

@ -22,9 +22,9 @@ class nova::metadata_api (
if !defined(Package[$::nova::params::pymemcache_package_name]) { if !defined(Package[$::nova::params::pymemcache_package_name]) {
package { $::nova::params::pymemcache_package_name: package { $::nova::params::pymemcache_package_name:
ensure => present, ensure => present,
before => Nova::Generic_service['api'],
} }
} }
Package[$::nova::params::pymemcache_package_name]-> Nova::Generic_service<|title=='api'|>
nova::generic_service { 'metadata-api': nova::generic_service { 'metadata-api':
enabled => true, enabled => true,

4
deployment/puppet/quantum/manifests/agents/l3.pp
View File

@ -120,8 +120,8 @@ class quantum::agents::l3 (
$external_alloc_pool = [$ext_ipinfo['pool_start'], $ext_ipinfo['pool_end']] $external_alloc_pool = [$ext_ipinfo['pool_start'], $ext_ipinfo['pool_end']]
} }
Keystone_user_role["$auth_user@$auth_tenant"] -> Quantum::Network::Setup <| |> Keystone_user_role<| title=="$auth_user@$auth_tenant"|> -> Quantum::Network::Setup <| |>
Keystone_user_role["$auth_user@$auth_tenant"] -> Quantum::Network::Provider_router <| |> Keystone_user_role<| title=="$auth_user@$auth_tenant"|> -> Quantum::Network::Provider_router <| |>
quantum::network::setup { 'net04': quantum::network::setup { 'net04':
physnet => $internal_physical_network, physnet => $internal_physical_network,