Move gnocchi upgrade and api to step 4

gnocchi upgrade requires storage sacks to be initialized. This means
we need to ensure the storage backends are up before running the
upgrade and starting the api. Lets move the api to step 4 so we can
ensure other dependencies are in place.

Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Depends-On: Ibfa9fb39f60c1e4a802d189b32ff4c34476c93d3
Change-Id: If2ae48b21389e76fd638c0b48c148a5d4f227630

1 files changed, 2 insertions, 20 deletions

diff --git a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
index 6c04e9d..90bdea0 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
@@ -36,9 +36,9 @@ describe 'tripleo::profile::base::gnocchi::api' do
       }
     end
 
-    context 'with step 3 on bootstrap' do
+    context 'with step 4 on bootstrap' do
       let(:params) { {
-        :step => 3,
+        :step => 4,
         :bootstrap_node => 'node.example.com',
         :gnocchi_redis_password => 'gnocchi',
         :redis_vip => '127.0.0.1'
@@ -51,20 +51,6 @@ describe 'tripleo::profile::base::gnocchi::api' do
       }
     end
 
-    context 'with step 3' do
-      let(:params) { {
-        :step => 3,
-        :gnocchi_redis_password => 'gnocchi',
-        :redis_vip => '127.0.0.1'
-      } }
-
-      it {
-        is_expected.to_not contain_class('gnocchi::db::sync')
-        is_expected.to contain_class('gnocchi::api')
-        is_expected.to contain_class('gnocchi::wsgi::apache')
-      }
-    end
-
     context 'with step 4' do
       let(:params) { {
         :step => 4,
@@ -129,10 +115,6 @@ describe 'tripleo::profile::base::gnocchi::api' do
       it {
         is_expected.to contain_class('gnocchi::api')
         is_expected.to contain_class('gnocchi::wsgi::apache')
-        is_expected.to contain_exec('run gnocchi upgrade with storage').with(
-          :command => 'gnocchi-upgrade --config-file=/etc/gnocchi/gnocchi.conf',
-          :path    => ['/usr/bin', '/usr/sbin']
-        )
       }
     end
   end