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 #10616 - use new pulp child ssl fragment for gpg key proxy #47

Merged
merged 1 commit into from Jun 1, 2015
Merged

Conversation

jlsherrill
Copy link
Contributor

No description provided.

@jlsherrill
Copy link
Contributor Author

Requires theforeman/puppet-pulp#66

@ehelms
Copy link
Member

ehelms commented May 29, 2015

What do you think about a test that ensures this gets called with this content file if $pulp is true?

@jlsherrill
Copy link
Contributor Author

@ehelms added test, not sure how to test the content, as it is a rendered template as a param value, any thoughts?

@@ -45,6 +45,8 @@

it { should contain_class('crane').with( {'key' => '/etc/pki/katello/private/katello-apache.key',
'cert' => '/etc/pki/katello/certs/katello-apache.crt'} ) }

it { should contain_pulp__child__fragment('gpg_key_proxy') }
Copy link
Member

Choose a reason for hiding this comment

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

I think you can do with here:

it 'should contain pulp gpg proxy' do
  should contain_pulp_child_fragment('gpg_key_proxy').with({
    :ssl_content => template('capsule/_pulp_child_gpg_proxy.erb'
  })
end

@jlsherrill
Copy link
Contributor Author

@ehelms updated

@ehelms
Copy link
Member

ehelms commented Jun 1, 2015

ACK

jlsherrill added a commit that referenced this pull request Jun 1, 2015
Refs #10616 - use new pulp child ssl fragment for gpg key proxy
@jlsherrill jlsherrill merged commit 4a385f0 into theforeman:master Jun 1, 2015
@jlsherrill jlsherrill deleted the 10616 branch June 1, 2015 14:37
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

2 participants