Commit Graph

9 Commits

Author SHA1 Message Date
Takashi Kajinami 8abf437ed2 Remove unused implementation to trigger ceilometer-upgrade
Currently the ceilometer-upgrade command is executed not by puppet, but
by the the indepdndent ceilometer_gnocchi_upgrade container.

Change-Id: I1886d96d558af4d7cf46ef59f7c0c7871a697581
2022-04-26 11:37:21 +09:00
Alex Schultz a566d6b9b8 Add check for bootstrap_node for downcase
Downcase in puppet 6.14 throws an error if the input to it is Undef. We
can avoid this by checking for a value before trying to downcase.

See context https://review.rdoproject.org/r/#/c/26297/

Change-Id: Ib2e97060523a4198a14949a15c9171b56928699c
2020-04-07 14:51:41 -06:00
Tobias Urdin 1523a4b804 Convert all class usage to relative names
Change-Id: Ib2ed745b682cf12f9469a5a64451adcabec400af
2019-12-08 23:23:25 +01:00
Steven Hardy 9cde9139c4 Replace bootstrap_nodeid with SERVICE_short_bootstrap_node_name
This solves the problem that bootstrap_nodeid, which is set to the
first node in each role via t-h-t, can match potentially more than
one node - e.g in the event that a service is deployed such that it
spans more than one role.

The SERVICE_short_bootstrap_node_name is automatically generated
based on the composable service template service_name, and this
considers all roles where the service is enabled, e.g it should
only evaluate true once regardles off the roles where the service
is enabled.

Change-Id: I48ec4549552910f3cb8db960b0ff10a6c61b4bb9
Partial-Bug: #1792613
2018-10-12 10:14:48 +00:00
Mehdi Abaakouk 5b1a139fa0 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
2017-12-18 11:59:35 +01:00
Pradeep Kilambi 1dcd10cd21 Drop the old skip-metering-database flag
This flag is removed upstream, lets drop this and have it
default to upgrade gnocchi resource types.

Change-Id: I97b721168ff34b0c390fbfbe11607e25dff1e3e7
2017-11-20 19:33:32 +00:00
Alex Schultz 661757a16f Retry ceilometer-upgrade
When the ceilometer-upgrade command is run in step5, it talks to gnocchi
and keystone on all the controllers. Since these other nodes might have
httpd restarted mid-upgrade we should retry if we get a failure.

Change-Id: I874cf9c34b41d055a258704dabe9150eab0f7968
Closes-Bug: #1703444
2017-07-16 05:21:40 +00:00
Steve Baker 94f13e6608 Ensure hiera step value is an integer
The step is typically set with the hieradata setting an integer value:

  {"step": 1}

However it would be useful for the value to be a string so that
substitutions are possible, for example:

  {"step": "%{::step}"}

This change ensures the step parameter defaults to an integer by
calling Integer(hiera('step'))

This change was made by manually removing the undef defaults from
fluentd.pp, uchiwa.pp, and sensu.pp then bulk updating with:

    find ./ -type f -print0 |xargs -0 sed -i "s/= hiera('step')/= Integer(hiera('step'))/"

Change-Id: I8a47ca53a7dea8391103abcb8960a97036a6f5b3
2017-06-14 14:31:52 +12:00
Pradeep Kilambi daf64974d8 Move ceilometer upgrade step out of base
ceilometer-upgrade should only run on controller nodes.
Since its currently in base profile, it gets triggered
on compute as well. So instead split out the upgrade
into its own and include when we deploy notification
and central agents instead.

Change-Id: I2910e8aa5da7fded4cf94b57fb0a14fefd88adbe
Closes-bug: #1693339
2017-05-24 16:44:41 -04:00