From 0e9ef8324b21f699eeb9a51d050689a82a1d7062 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Thu, 20 Jul 2017 20:28:44 +0200 Subject: [PATCH] Fix lint issues to upgrade to puppet-lint 2.3 2017-07-20 14:41:18.752841 | manifests/cell_v2/simple_setup.pp:52:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.752941 | manifests/cell_v2/simple_setup.pp:53:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.752974 | manifests/deps.pp:85:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.753009 | manifests/deps.pp:96:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.753044 | manifests/deps.pp:105:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.753079 | manifests/deps.pp:106:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.753114 | manifests/deps.pp:114:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.753154 | manifests/wsgi/apache_placement.pp:121:WARNING: arrow should be on the right operand's line 2017-07-20 14:41:18.753189 | manifests/wsgi/apache_placement.pp:122:WARNING: arrow should be on the right operand's line Change-Id: Ic6233d66c4fee0564b646c21984db230eaf859b0 --- manifests/cell_v2/simple_setup.pp | 6 +++--- manifests/deps.pp | 18 +++++++++--------- manifests/wsgi/apache_placement.pp | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/manifests/cell_v2/simple_setup.pp b/manifests/cell_v2/simple_setup.pp index f3dbd252e..147627dbd 100644 --- a/manifests/cell_v2/simple_setup.pp +++ b/manifests/cell_v2/simple_setup.pp @@ -49,8 +49,8 @@ class nova::cell_v2::simple_setup ( include ::nova::cell_v2::discover_hosts - Class['nova::cell_v2::map_cell0'] -> - Nova_cell_v2 <| |> ~> - Class['nova::cell_v2::discover_hosts'] + Class['nova::cell_v2::map_cell0'] + -> Nova_cell_v2 <| |> + ~> Class['nova::cell_v2::discover_hosts'] } diff --git a/manifests/deps.pp b/manifests/deps.pp index 796aee1ad..694fd7b9f 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -82,8 +82,8 @@ class nova::deps { # Wedge this in after the db creation and before the services anchor { 'nova::dbsync_api::begin': subscribe => Anchor['nova::db::end'] - } -> - anchor { 'nova::dbsync_api::end': + } + -> anchor { 'nova::dbsync_api::end': notify => Anchor['nova::service::begin'], } @@ -93,8 +93,8 @@ class nova::deps { Anchor['nova::db::end'], Anchor['nova::dbsync_api::end'] ] - } -> - anchor { 'nova::dbsync::end': + } + -> anchor { 'nova::dbsync::end': notify => Anchor['nova::service::begin'] } @@ -102,17 +102,17 @@ class nova::deps { # be overridden using the spaceship operator to move it around when needed anchor { 'nova::cell_v2::begin': subscribe => Anchor['nova::dbsync_api::end'] - } -> - Nova::Cell_v2::Cell<||> ~> - anchor { 'nova::cell_v2::end': + } + -> Nova::Cell_v2::Cell<||> + ~> anchor { 'nova::cell_v2::end': notify => Anchor['nova::dbsync::begin'] } # Wedge online data migrations after db/api_sync and before service anchor { 'nova::db_online_data_migrations::begin': 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'] } } diff --git a/manifests/wsgi/apache_placement.pp b/manifests/wsgi/apache_placement.pp index 480ed00c1..3994b73f4 100644 --- a/manifests/wsgi/apache_placement.pp +++ b/manifests/wsgi/apache_placement.pp @@ -122,9 +122,9 @@ class nova::wsgi::apache_placement ( } # 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' |> -> - File[$::nova::params::placement_httpd_config_file] ~> - Service['httpd'] + Package<| title == 'nova-placement-api' |> + -> File[$::nova::params::placement_httpd_config_file] + ~> Service['httpd'] ::openstacklib::wsgi::apache { 'placement_wsgi': bind_host => $bind_host,