Skip to content

Commit fc4ef12

Browse files
committed
update to 4.0.0 for RHSM release API addition
1 parent 3e448d5 commit fc4ef12

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

README

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Puppet-Subscription_manager
1+
# Puppet-Subscription\_manager
22

3-
[![Build Status](https://travis-ci.org/waveclaw/puppet-subscription_manager.svg?branch=master)](https://travis-ci.org/waveclaw/puppet-subscription_manager) [![Code Climate](https://codeclimate.com/github/waveclaw/puppet-subscription_manager/badges/gpa.svg)](https://codeclimate.com/github/waveclaw/puppet-subscription_manager) [![Test Coverage](https://codeclimate.com/github/waveclaw/puppet-subscription_manager/badges/coverage.svg)](https://codeclimate.com/github/waveclaw/puppet-subscription_manager/coverage)
3+
[![Build Status](https://travis-ci.org/waveclaw/puppet-subscription_manager.svg?branch=master)](https://travis-ci.org/waveclaw/puppet-subscription_manager) [![Code Climate](https://codeclimate.com/github/waveclaw/puppet-subscription_manager/badges/gpa.svg)](https://codeclimate.com/github/waveclaw/puppet-subscription_manager) [![Test Coverage](https://codeclimate.com/github/waveclaw/puppet-subscription_manager/badges/coverage.svg)](https://codeclimate.com/github/waveclaw/puppet-subscription\_manager/coverage)
44

55
This module provides Custom Puppet Provider to handle registration and
66
consumption of RedHat subscriptions using subscription-manager as part of Katello
@@ -156,7 +156,11 @@ Register a RedHat Enterprise 7 or CentOS 7 node to Satellite 6 using an activati
156156
}
157157
```
158158
> Notice that the `rhsm_repo_ca_cert` must change to match the certificate provided
159-
> by the katello-ca-consumer package on the Satellite server.
159+
> by the katello-ca-consumer package on the Satellite server. This can be
160+
> contained in the files searched by the `rhsm_ca_cert` fact. These are SSL
161+
> certificates which do not take into account Subject Alternative Names. Only
162+
> the primary name in the certificate is used to check if the client is
163+
> registered to the correct server.
160164

161165

162166
Register to a local RedHat SAM server.
@@ -197,13 +201,12 @@ The module adds the following new types:
197201
##### Mandatory
198202

199203
- **server_hostname**: Specify a registration server hostname such as subscription.rhn.redhat.com.
200-
- **org**: provide an organization to join (defaults to the Default_Organization
201-
)
204+
- **org**: provide an organization to join (defaults to the Default_Organization). In the commerical Satellite 6 product's user interface this can be set to a template value such as `<%= @host.rhsm_organization_label %>`
202205

203206
Either an activation key or a username and password combination is needed to
204207
register. Both cannot be provided and will cause an error.
205208

206-
- **activationkey**: The activation key to use when registering the system (cannot be used with username and password)
209+
- **activationkey**: The activation key to use when registering the system (cannot be used with username and password). In the commerical Satellite 6 product's user interface this can be set to a template value such as `<%= @host.params['kt_activation_keys'] %>`
207210
- **password**: The password to use when registering the system
208211
- **username**: The username to use when registering the system
209212

@@ -258,7 +261,7 @@ See the documentation at [RedHat Support](https://access.redhat.com/documentatio
258261

259262
The most important settings are as follows. Specific support is made for them.
260263

261-
- **server_hostname**: Same as the title or name of the resource
264+
- **server_hostname**: Same as the title or name of the resource. In the commerical Satellite 6 product's user interface this can be set to a template value such as `<%= @host.content_source.hostname %>`
262265
- **server_insecure**: If HTTP is used or HTTPS with an untrusted certificate
263266
- **server_prefix**: The subscription path. Usually `/subscription` for RHN and `/rhsm` for a Katello installation.
264267
- **rhsm_baseurl**: The Content base URL in case the registration server has no content. An example would be [https://cdn.redhat.com](https://cdn.redhat.com) or [https://katello.example.com/pulp/repos](https://katello.example.com/pulp/repos)

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "waveclaw-subscription_manager",
3-
"version": "3.3.3",
3+
"version": "4.0.0",
44
"author": "JD Powell <[email protected]>",
55
"summary": "Manage Katello or Satellite registrations.",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)