Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ncm-ceph: fix user for known_hosts and fix output for destroy and restart #595

Merged
merged 4 commits into from Dec 11, 2015

Conversation

kwaegema
Copy link
Member

@kwaegema kwaegema commented Oct 1, 2015

fixes #585 and #586

@kwaegema kwaegema added this to the 15.10 milestone Oct 1, 2015
@kwaegema kwaegema force-pushed the fixes branch 2 times, most recently from 50fd52b to 72fed66 Compare October 1, 2015 08:44
@@ -161,8 +161,8 @@ sub ssh_known_keys {
if (!$lines) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for looking at something that is not in the diff, but whaty's the purpose of this? It looks like you only care on whether the output is empty?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

($key_accept eq 'first') means: only add the ssh key blindy if it is not already there. If it is there, it will not replace it, it only does that when key_accept is 'always'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, github isn't showing you what I meant. I meant this chunk (expand the context):

my $cmd = ['/usr/bin/ssh-keygen', '-F', $host];
my $output = $self->run_command_as_ceph($cmd);
# Count the lines of the output
my $lines = $output =~ tr/\n//;
if (!$lines) {

Why do you need to count lines at all? It looks to me like you're doing something if there is output and something if there isn't.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It needs to trim the newlines, because of the behaviour of ssh-keygen:

[kwaegema@daenerys ~]$ bla=`ssh-keygen -F gastlyf.ugent.be`
[kwaegema@daenerys ~]$ echo $bla

[kwaegema@daenerys ~]$ 

@stdweird
Copy link
Member

@kwaegema minor remark and update branch

@stdweird
Copy link
Member

rebase instead of update branch

@kwaegema
Copy link
Member Author

done

@kwaegema
Copy link
Member Author

kwaegema commented Dec 4, 2015

@stdweird rebased again

@jrha
Copy link
Member

jrha commented Dec 4, 2015

@gvasilak can you have a look over this?

@jrha
Copy link
Member

jrha commented Dec 7, 2015

Also @GRyall...

jrha added a commit that referenced this pull request Dec 11, 2015
ncm-ceph: fix user for known_hosts and fix output for destroy and restart
@jrha jrha merged commit 7ad4777 into quattor:master Dec 11, 2015
@kwaegema kwaegema deleted the fixes branch January 12, 2016 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

ncm-ceph: manual commands for removing monitors
4 participants