ncm-openstack: add ceilometer service #1383
Conversation
alvarosimon
force-pushed
the
os_ceilometer
branch
from
5cab54a to
a79eef3
Compare
alvarosimon
force-pushed
the
os_ceilometer
branch
from
a79eef3 to
fb47ad9
Compare
alvarosimon
force-pushed
the
os_ceilometer
branch
from
67100db to
393e368
Compare
alvarosimon
force-pushed
the
os_ceilometer
branch
from
4a49bfc to
45669bb
Compare
alvarosimon
changed the title
| # db_version is slow when not initialised | ||
| # (lots of retries before it gives up; can take up to 90s) | ||
| if ($self->_do([$self->{manage}, @{$self->{db_version}}], 'determine database version', test => 1)) { | ||
| if ($self->_do(['/bin/bash', '-c', join(' ', $self->{manage}, @{$self->{db_version}})], 'determine database version', test => 1)) { |
There was a problem hiding this comment.
@stdweird this is just a workaround to avoid the execution issue with ceilometer-upgrade.
I have changed the unittests as well but now it is a bit messy, some commands are using /bin/bash workaround some of them are not.
We should provide a better solution (maybe just adding a new flag into CAF::Process to use the "right" environment?)
There was a problem hiding this comment.
I've created a CAF issue for this, could you fill it in with more details of what would be required to avoid this workaround?
quattor/CAF#272
| $self->verbose("Found existing db_version"); | ||
| return 1 if ($self->{flavour} eq "rabbitmq"); | ||
| } else { | ||
| $self->verbose("Database not yet available for service $self->{flavour}"); | ||
| }; | ||
|
|
||
| # Always populate/sync the databases | ||
| $self->pre_populate_service_database(); | ||
| if ($self->_do([$self->{manage}, @{$self->{db_sync}}], 'populate database')) { | ||
| if ($self->_do(['/bin/bash', '-c', join(' ', $self->{manage}, @{$self->{db_sync}})], 'populate database')) { |
There was a problem hiding this comment.
same env issue with ceilometer-upgrade execution
alvarosimon
force-pushed
the
os_ceilometer
branch
from
3b22cb0 to
3600bac
Compare
|
This looks good to me on the proviso that I havent really checked the perl |
Include ceilometer server Resolves: quattor#1381
|
Rebased on master to avoid conflicts now that #1354 has been merged. |
NOTE: This PR requires #1354 to work, #1354 should be reviewed/merged first.