Skip to content

Add server_max_queued_requests and server_max_retry_delay parameters#570

Merged
mmoll merged 1 commit intotheforeman:masterfrom
syseleven:feature/add-max-queued-requests-and-max-retry-delay
Jan 4, 2018
Merged

Add server_max_queued_requests and server_max_retry_delay parameters#570
mmoll merged 1 commit intotheforeman:masterfrom
syseleven:feature/add-max-queued-requests-and-max-retry-delay

Conversation

@baurmatt
Copy link
Copy Markdown
Contributor

@baurmatt baurmatt commented Dec 22, 2017

Copy link
Copy Markdown
Contributor

@mmoll mmoll left a comment

Choose a reason for hiding this comment

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

This only works for Puppetserver >= 5.1, so there needs to be an added version check

@theforeman-bot
Copy link
Copy Markdown
Member

@baurmatt, the Redmine ticket used is for a different project than the one associated with this GitHub repository. Please either:

If changing the ticket number used, remember to update the PR title and the commit message (using git commit --amend).


This message was auto-generated by Foreman's prprocessor

@baurmatt
Copy link
Copy Markdown
Contributor Author

baurmatt commented Jan 4, 2018

Yes of course -.- It should now be fixed.

Edit: Not sure what @theforeman-bot wants from me :D

@theforeman-bot
Copy link
Copy Markdown
Member

@baurmatt, the Redmine ticket used is for a different project than the one associated with this GitHub repository. Please either:

If changing the ticket number used, remember to update the PR title and the commit message (using git commit --amend).


This message was auto-generated by Foreman's prprocessor

@ekohl
Copy link
Copy Markdown
Member

ekohl commented Jan 4, 2018

We have the convention that #xxx refers to our Redmine issues while GH-xxx refers to Github issues. Could you amend the commit message to use that syntax?

@baurmatt
Copy link
Copy Markdown
Contributor Author

baurmatt commented Jan 4, 2018

Ah, yeah sure. Its fixed now :)

Copy link
Copy Markdown
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Other than the testing code (only mentioned once) it looks good.

)
end
it 'should have max-queued-requests: 0' do
content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We have a verify_content for this, or the regular expected.to contain_file('/etc/custom/...').with_content(/^ max-queued-requests: 0$/) should work.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've just copied it from another test in this file, seems like there are a lot of options which are used in those tests ;) Switched to expected.to contain_file... :)

Copy link
Copy Markdown
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

The failure looks unrelated. I'm trying to tackle that in #573

@mmoll mmoll merged commit f1fbfe8 into theforeman:master Jan 4, 2018
@mmoll
Copy link
Copy Markdown
Contributor

mmoll commented Jan 4, 2018

merged, danke @baurmatt!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants