openstack/puppet-nova
Code Issues Proposed changes

Merge "Fix lint issues to upgrade to puppet-lint 2.3"

Browse Source
This commit is contained in:
Jenkins
2017-07-22 05:02:23 +00:00
committed by Gerrit Code Review
parent cb311a1c91 0e9ef8324b
commit d84969d5de
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/cell_v2/simple_setup.pp
View File

@@ -49,8 +49,8 @@ class nova::cell_v2::simple_setup (
include ::nova::cell_v2::discover_hosts include ::nova::cell_v2::discover_hosts
Class['nova::cell_v2::map_cell0'] -> Class['nova::cell_v2::map_cell0']
Nova_cell_v2 <| |> ~> -> Nova_cell_v2 <| |>
Class['nova::cell_v2::discover_hosts'] ~> Class['nova::cell_v2::discover_hosts']
} }

18
manifests/deps.pp
View File

@@ -82,8 +82,8 @@ class nova::deps {
# Wedge this in after the db creation and before the services # Wedge this in after the db creation and before the services
anchor { 'nova::dbsync_api::begin': anchor { 'nova::dbsync_api::begin':
subscribe => Anchor['nova::db::end'] subscribe => Anchor['nova::db::end']
} -> }
anchor { 'nova::dbsync_api::end': -> anchor { 'nova::dbsync_api::end':
notify => Anchor['nova::service::begin'], notify => Anchor['nova::service::begin'],
} }
@@ -93,8 +93,8 @@ class nova::deps {
Anchor['nova::db::end'], Anchor['nova::db::end'],
Anchor['nova::dbsync_api::end'] Anchor['nova::dbsync_api::end']
] ]
} -> }
anchor { 'nova::dbsync::end': -> anchor { 'nova::dbsync::end':
notify => Anchor['nova::service::begin'] notify => Anchor['nova::service::begin']
} }
@@ -102,17 +102,17 @@ class nova::deps {
# be overridden using the spaceship operator to move it around when needed # be overridden using the spaceship operator to move it around when needed
anchor { 'nova::cell_v2::begin': anchor { 'nova::cell_v2::begin':
subscribe => Anchor['nova::dbsync_api::end'] subscribe => Anchor['nova::dbsync_api::end']
} -> }
Nova::Cell_v2::Cell<||> ~> -> Nova::Cell_v2::Cell<||>
anchor { 'nova::cell_v2::end': ~> anchor { 'nova::cell_v2::end':
notify => Anchor['nova::dbsync::begin'] notify => Anchor['nova::dbsync::begin']
} }
# Wedge online data migrations after db/api_sync and before service # Wedge online data migrations after db/api_sync and before service
anchor { 'nova::db_online_data_migrations::begin': anchor { 'nova::db_online_data_migrations::begin':
subscribe => Anchor['nova::dbsync_api::end'] subscribe => Anchor['nova::dbsync_api::end']
} -> }
anchor { 'nova::db_online_data_migrations::end': -> anchor { 'nova::db_online_data_migrations::end':
notify => Anchor['nova::service::begin'] notify => Anchor['nova::service::begin']
} }
} }

6
manifests/wsgi/apache_placement.pp
View File

@@ -122,9 +122,9 @@ class nova::wsgi::apache_placement (
} }
# Ubuntu requires nova-placement-api to be installed before apache to find wsgi script # Ubuntu requires nova-placement-api to be installed before apache to find wsgi script
Package<| title == 'nova-placement-api'|> -> Package<| title == 'httpd'|> Package<| title == 'nova-placement-api'|> -> Package<| title == 'httpd'|>
Package<| title == 'nova-placement-api' |> -> Package<| title == 'nova-placement-api' |>
File[$::nova::params::placement_httpd_config_file] ~> -> File[$::nova::params::placement_httpd_config_file]
Service['httpd'] ~> Service['httpd']
::openstacklib::wsgi::apache { 'placement_wsgi': ::openstacklib::wsgi::apache { 'placement_wsgi':
bind_host => $bind_host, bind_host => $bind_host,