Skip to content

Commit 7fa27bd

Browse files
authored
Merge pull request #68 from jcpunk/sat6-ui
Add some Sat6/Katello/Foreman settings to permit automatic settings. This is merged ignoring the useless and unused Rubocop junk.
2 parents d448e00 + 4f5b9e8 commit 7fa27bd

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,12 @@ The module adds the following new types:
201201
##### Mandatory
202202

203203
- **server_hostname**: Specify a registration server hostname such as subscription.rhn.redhat.com.
204-
- **org**: provide an organization to join (defaults to the Default_Organization
205-
)
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 %>`
206205

207206
Either an activation key or a username and password combination is needed to
208207
register. Both cannot be provided and will cause an error.
209208

210-
- **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'] %>`
211210
- **password**: The password to use when registering the system
212211
- **username**: The username to use when registering the system
213212

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

263262
The most important settings are as follows. Specific support is made for them.
264263

265-
- **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 %>`
266265
- **server_insecure**: If HTTP is used or HTTPS with an untrusted certificate
267266
- **server_prefix**: The subscription path. Usually `/subscription` for RHN and `/rhsm` for a Katello installation.
268267
- **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)

0 commit comments

Comments
 (0)