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.

Sign up for GitHub

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 #6126: Change RHSM API to /rhsm. #28

Merged
merged 1 commit into from
Jul 16, 2014
Merged

Refs #6126: Change RHSM API to /rhsm. #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
Class['certs'] ~>
class { 'certs::apache': } ~>
class { 'certs::katello':
deployment_url => $katello::deployment_url,
deployment_url => $katello::rhsm_url,
} ~>
class { 'katello::install': } ~>
class { 'katello::config': } ~>
Expand All @@ -71,7 +71,7 @@
user_groups => $katello::user_groups,
oauth_key => $katello::oauth_key,
oauth_secret => $katello::oauth_secret,
deployment_url => 'katello',
deployment_url => $katello::deployment_url,
ca_key => $certs::ca_key,
ca_cert => $certs::ca_cert_stripped,
keystore_password => $::certs::candlepin::keystore_password,
Expand Down
14 changes: 2 additions & 12 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
$scl_root = ''
}

$rhsm_url = '/rhsm'
$deployment_url = '/katello'

if file_exists('/usr/sbin/tomcat') and !file_exists('/usr/sbin/tomcat6') {
Expand All @@ -18,18 +19,6 @@
$tomcat = 'tomcat6'
}

case $deployment_url {
'/katello': {
$deployment = 'katello'
}
'/headpin': {
$deployment = 'headpin'
}
default : {
$deployment = 'katello'
}
}

# HTTP Proxy settings (currently used by pulp)
$proxy_url = undef
$proxy_port = undef
Expand All @@ -55,6 +44,7 @@
$foreman_oauth_key = 'foreman'
$oauth_token_file = 'katello_oauth_secret'
$oauth_secret = cache_data($oauth_token_file, random_password(32))

$post_sync_token = cache_data('post_sync_token', random_password(32))

# Subsystems settings
Expand Down
2 changes: 1 addition & 1 deletion templates/etc/httpd/conf.d/05-foreman-ssl.d/katello.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Alias /pub /var/www/html/pub
Options +FollowSymLinks +Indexes
</Location>

<LocationMatch /subscription|/katello/api>
<LocationMatch /rhsm|/subscription|/katello/api>
RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s"
SSLVerifyClient optional
SSLRenegBufferSize 16777216
Expand Down
6 changes: 2 additions & 4 deletions templates/katello.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,19 @@
# see /usr/share/katello/config.katello_defaults.yml for available options

common:
app_mode: <%= scope.lookupvar("katello::params::deployment") %>
app_mode: 'katello'
Copy link

Choose a reason for hiding this comment

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

It's outside of the scope of this PR but can you open an issue to remove app_mode in the future if it's no longer going to be configurable?

Copy link
Member Author

Choose a reason for hiding this comment

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

http://projects.theforeman.org/issues/4121 -- exists to clean all of this up. I started on it at one point but got side tracked since it wasn't blocking anything to have them around.


warden: <%= scope.lookupvar("katello::params::auth_method") %>
ldap_roles: <%= scope.lookupvar("katello::params::ldap_roles") %>
validate_ldap: <%= scope.lookupvar("katello::params::validate_ldap") %>
rest_client_timeout: 120

url_prefix: <%= scope.lookupvar("katello::params::deployment_url") %>
url_prefix: <%= @deployment_url %>
host: <%= has_variable?("fqdn") ? @fqdn : hostname %>
port:
use_ssl: true
use_foreman: <%= scope.lookupvar("katello::params::use_foreman") %>

consumer_cert_rpm: <%= scope.lookupvar("certs::katello::candlepin_cert_rpm_alias") %>

post_sync_url: https://localhost<%= scope.lookupvar("katello::params::deployment_url") %>/api/v2/repositories/sync_complete?token=<%= scope.lookupvar("post_sync_token") %>

candlepin:
Expand Down