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

refs #3272 - pass admin user details into db:seed rake task #190

Merged
merged 1 commit into from Jun 30, 2014

Conversation

domcleal
Copy link
Contributor

Review only, I've not made submitted the change to core yet - though it's otherwise harmless so we can merge once that's on track.

Depends on theforeman/foreman#1445.

Merge theforeman/foreman-installer#116 after this one.

$admin_password = $foreman::params::admin_password,
$admin_first_name = $foreman::params::admin_first_name,
$admin_last_name = $foreman::params::admin_last_name,
$admin_email = $foreman::params::admin_email
Copy link
Member

Choose a reason for hiding this comment

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

We can use trailing commas now :)

@ekohl
Copy link
Member

ekohl commented May 13, 2014

Looks good to me.

@domcleal
Copy link
Contributor Author

Rebased onto #192 so it will now configure the CLI with the username and password that were passed or randomised in 'foreman'.

$request_timeout = $::foreman::cli::params::request_timeout,
) inherits foreman::cli::params {
# Inherit URL & auth parameters from foreman class if possible
$foreman_url_real = $foreman_url ? {
Copy link
Member

Choose a reason for hiding this comment

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

There's https://github.com/puppetlabs/puppetlabs-stdlib#pick: $foreman_url_real = pick($foreman_url, $::foreman::foreman_url) is more readable IMHO.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Much better, thanks!

@@ -127,7 +127,14 @@

# We need the REST API interface with OAuth for some REST Puppet providers
$oauth_active = true
$oauth_map_users = true
$oauth_map_users = false
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've changed this default as the foreman_proxy::register class needs to know the username otherwise of the account to register through. OAuth API access either works as the admin user (or anonymous API admin since #3272) or is mapped to a specific user account, I don't think we need the complication of the latter, certainly not by default.

@domcleal domcleal changed the title [do not merge] refs #3272 - pass admin user details into db:seed rake task refs #3272 - pass admin user details into db:seed rake task May 21, 2014
@GregSutcliffe
Copy link
Member

Tested, works great, 👍 will merge when the core PR goes in.

@ohadlevy
Copy link
Member

PR is merged, merge at will

@domcleal domcleal merged commit 5534df9 into theforeman:master Jun 30, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants