Comment 31 for bug 1724328

Reviewed: https://review.openstack.org/527940
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=5b1a139fa0bfda2c5b38754b3d31ee28023cbef5
Submitter: Zuul
Branch: master

commit 5b1a139fa0bfda2c5b38754b3d31ee28023cbef5
Author: Mehdi Abaakouk <email address hidden>
Date: Thu Dec 14 12:36:26 2017 +0100

    gnocchi/ceilometer upgrade workflow fix

    The current workflow for gnocchi/ceilometer upgrade doesn't
    work well with swift backend.

    Notification agent push data into Gnocchi on step4, but
    Ceilometer-upgrade run only on step5, So Gnocchi have not been populated
    with latest resource schemas.

    Gnocchi-api is started in step3 but gnocchi::storage configuration have
    not been done and database upgrade have not been done.

    When configuration is done on step4, httpd will be restarted.

    This change will fix this issue by:

    * Doing only the Gnocchi database upgrade on step3 because swift is
      ready only on step4.
    * Configuring gnocchi::storage on step3 to avoid gnocchi-api restart on
      step4.
    * Add dependencies between ceilometer-upgrade and gnocchi-api in case of
      non multinode deployment.

    This ensures:

    * gnocchi-api will be correctly configured at the end of
      step3 (configuration+database-sync).
    * No new measures will be pushed to Gnocchi before ceilometer-upgrade have
      upgraded the Gnocchi resource schemas.
    * Gnocchi-api have database updated before ceilometer-upgrade need it.
    * We continue to upgrade storage/incoming data of Gnocchi on step4 after
      swift is up.

    Closes-bug: #1724328
    Change-Id: I3f9a784e507e03454b335ba8319601fba208ba0a