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

Use proper spelling for Red Hat #778

Merged
merged 1 commit into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@
- docs: add additional details to per-instance/once [Joshua Powers]
- Update doc-requirements.txt [Joshua Powers]
- doc-requirements: add missing dep [Joshua Powers]
- dhcp: Support RedHat dhcp rfc3442 lease format for option 121 (#76)
- dhcp: Support Red Hat dhcp rfc3442 lease format for option 121 (#76)
[Eric Lafontaine] (LP: #1850642)
- network_state: handle empty v1 config (#45) (LP: #1852496)
- docs: Add document on how to report bugs [Joshua Powers]
Expand Down
4 changes: 2 additions & 2 deletions cloudinit/config/cc_resolv_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
This module is intended to manage resolv.conf in environments where early
configuration of resolv.conf is necessary for further bootstrapping and/or
where configuration management such as puppet or chef own dns configuration.
As Debian/Ubuntu will, by default, utilize resolvconf, and similarly RedHat
As Debian/Ubuntu will, by default, utilize resolvconf, and similarly Red Hat
will use sysconfig, this module is likely to be of little use unless those
are configured correctly.

.. note::
For RedHat with sysconfig, be sure to set PEERDNS=no for all DHCP
For Red Hat with sysconfig, be sure to set PEERDNS=no for all DHCP
enabled NICs.

.. note::
Expand Down
8 changes: 4 additions & 4 deletions cloudinit/config/cc_rh_subscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
# This file is part of cloud-init. See LICENSE file for license information.

"""
RedHat Subscription
-------------------
Red Hat Subscription
--------------------
**Summary:** register red hat enterprise linux based system

Register a RedHat system either by username and password *or* activation and
Register a Red Hat system either by username and password *or* activation and
org. Following a sucessful registration, you can auto-attach subscriptions, set
the service level, add subscriptions based on pool id, enable/disable yum
repositories based on repo id, and alter the rhsm_baseurl and server-hostname
in ``/etc/rhsm/rhs.conf``. For more details, see the ``Register RedHat
in ``/etc/rhsm/rhs.conf``. For more details, see the ``Register Red Hat
Subscription`` example config.

**Internal name:** ``cc_rh_subscription``
Expand Down
4 changes: 2 additions & 2 deletions doc/rtd/topics/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ Disk setup
:language: yaml
:linenos:

Register RedHat Subscription
============================
Register Red Hat Subscription
=============================

.. literalinclude:: ../../examples/cloud-config-rh_subscription.txt
:language: yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/cloud_tests/testcases/examples/TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Below lists each of the issing examples and why it is not currently added.
- Puppet (takes > 60 seconds to run)
- Manage resolve.conf (lxd backend overrides changes)
- Adding a yum repository (need centos system)
- Register RedHat Subscription (need centos system + subscription)
- Register Red Hat Subscription (need centos system + subscription)
- Adjust mount points mounted (need multiple disks)
- Call a url when finished (need end point)
- Reboot/poweroff when finished (how to test)
Expand Down