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

Jump to bottom

Expand Puppet documentation on the service name #1905

Merged
merged 3 commits into from
Sep 12, 2023
Merged

Expand Puppet documentation on the service name #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebab454
Expand Puppet documentation on the service name
ekohl Sep 12, 2023
ff772b9
Correct puppet service name in docs
ekohl Sep 12, 2023
f5b9f81
Correct escaping
ekohl Sep 12, 2023
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Foreman Infrastructure

This repo contains puppet modules that are used to manage infrastructure used by the Foreman project. These modules manage many different pieces of software, including Jenkins build slaves, package build machines, the Jenkins frontend, as well as an internal Foreman instance and puppetmaster.
This repo contains puppet modules that are used to manage infrastructure used by the Foreman project. These modules manage many different pieces of software, including Jenkins build slaves, package build machines, the Jenkins frontend, as well as an internal Foreman instance and puppetserver.

View the [documentation](https://theforeman.github.io/foreman-infra).

Expand Down
12 changes: 6 additions & 6 deletions docs/jenkins.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ For Enterprise Linux:
* Ensure EPEL is configured: [epel-release](https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm)
* Ensure yum.puppet.com is configured: [puppet7-release](https://yum.puppet.com/puppet7-release-el-7.noarch.rpm)
* `yum -y install puppet-agent`
* `echo "server = puppetmaster.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider> is osuosl or aws for example and that the record is in DNS
* `echo "server = puppet.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider\> is osuosl or aws for example and that the record is in DNS
* Make the `puppet` command available: `source /etc/profile.d/puppet-agent.sh`
* `puppet ssl bootstrap`
* Sign the certificate on the puppetmaster or via Foreman
* Sign the certificate on the puppetserver or via Foreman
* `puppet agent --test`
* Set the host group to "Builders" in Foreman
* Run `puppet agent --test` twice (second run is important, due to the rvm module behaviour)
Expand All @@ -73,11 +73,11 @@ For Debian:

* Ensure apt.puppet.com is configured: [puppet7-release](https://apt.puppetlabs.com/puppet7-release-bullseye.deb)
* `apt update && apt install puppet-agent`
* `echo "server = puppetmaster.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
* `echo "server = puppet.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
* Make the `puppet` command available: `source /etc/profile.d/puppet-agent.sh`
* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider> is osuosl or aws for example and that the record is in DNS
* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider\> is osuosl or aws for example and that the record is in DNS
* `puppet ssl bootstrap`
* Sign the certificate on the puppetmaster or via Foreman
* Sign the certificate on the puppetserver or via Foreman
* `puppet agent --test`
* Set the host group to "Builders/Debian" in Foreman
* Run `puppet agent --test` twice (second run is important, due to the rvm module behaviour)
3 changes: 3 additions & 0 deletions docs/puppet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Puppetserver

The puppetserver is hosted on `puppet.theforeman.org`, which is a CNAME to the actual server.
On the actual server a subjectAltName is configured so both the hostname and service name should work.

| | puppet01.conova.theforeman.org |
| - | - |
| type | Libvirt VM |
Expand Down
2 changes: 1 addition & 1 deletion docs/virt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Now bootstrap Puppet:
dnf install https://yum.puppet.com/puppet7-release-el-8.noarch.rpm
dnf install puppet-agent
. /etc/profile.d/puppet-agent.sh
puppet config set server puppetmaster.theforeman.org
puppet config set server puppet.theforeman.org
puppet ssl bootstrap
puppet agent -t
```
Expand Down