Skip to content

Commit

Permalink
Merge pull request #35 from ehelms/update-to-2.0.0
Browse files Browse the repository at this point in the history
Update to 2.0.0
  • Loading branch information
ehelms authored May 15, 2023
2 parents b52ec23 + 26ee627 commit 1fae25e
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
- stable-2.12
- stable-2.13
- stable-2.14
- stable-2.15
- devel
include:
- python: "3.8"
Expand Down Expand Up @@ -103,6 +104,7 @@ jobs:
molecule:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
python:
- "3.9"
Expand All @@ -111,6 +113,7 @@ jobs:
- stable-2.12
- stable-2.13
- stable-2.14
- stable-2.15
- devel
include:
- python: "3.8"
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ redhat.satellite_operations Release Notes
.. contents:: Topics


v2.0.0
======

Minor Changes
-------------

- cloud_connector role - don't mark proxy.conf systemd drop-in word-inaccessible, there is no benefit and systemd warns about this (https://bugzilla.redhat.com/show_bug.cgi?id=2169682)

v1.3.0
======

Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ doc: $(MANIFEST)
branding:
sed -i 's/theforeman\.operations/redhat.satellite_operations/g' changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml
sed -i 's/foreman.example.com/satellite.example.com/g' roles/*/README.md roles/*/*/*.yml
sed -i 's/katello/satellite/g' roles/*/README.md roles/*/*/*.yml
sed -i 's#theforeman/foreman-operations-collection#RedHatSatellite/satellite-operations-collection#g' .github/workflows/*.yml
sed -i 's/theforeman-foreman/redhat-satellite-operations/g' .github/workflows/*.yml
sed -i 's/Foreman Operations Collection/Red Hat Satellite Operations Collection/g' docs/index.rst docs/conf.py
Expand Down
8 changes: 8 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,11 @@ releases:
minor_changes:
- new role to configure backups using ``foreman-maintain``
release_date: '2023-01-04'
2.0.0:
changes:
minor_changes:
- cloud_connector role - don't mark proxy.conf systemd drop-in word-inaccessible,
there is no benefit and systemd warns about this (https://bugzilla.redhat.com/show_bug.cgi?id=2169682)
fragments:
- bz2169682-world-inaccessible.yml
release_date: '2023-05-08'
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors:
- "Matthias Dellweg <[email protected]>"
- "Robert Rettig <[email protected]>"
- "willtome <[email protected]>"
version: "1.3.0"
version: "2.0.0"
license:
- "GPL-3.0-or-later"
tags:
Expand Down
5 changes: 4 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ pylint==2.6.0; python_version >= '3.6'
voluptuous==0.12.1 # from https://github.com/ansible/ansible/raw/devel/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt
yamllint
molecule[docker,lint]
ansible-lint
molecule-plugins[docker]; python_version >= '3.9'
ansible-compat<4; python_version >= '3.6' # https://github.com/ansible-community/molecule/issues/3903
ansible-lint; python_version >= '3.9'
ansible-lint<6.12.0; python_version < '3.9'
2 changes: 0 additions & 2 deletions roles/backup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Role Variables
* `satellite_backup_type`: Backup type, can be either `online` or `offline`, defaults to `online`
* `satellite_backup_keep_full`: How many full (weekly) backups to keep, defaults to `2`

None

Example Playbooks
-----------------

Expand Down
4 changes: 2 additions & 2 deletions roles/cloud_connector/tasks/http_proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
path: /etc/systemd/system/rhcd.service.d
owner: root
group: root
mode: 0755
mode: '0755'

- name: Deploy HTTP proxy systemd drop-in file
ansible.builtin.template:
src: "proxy.conf.j2"
dest: /etc/systemd/system/rhcd.service.d/proxy.conf
owner: root
group: root
mode: 0640
mode: '0644'
notify:
- Restart rhcd
7 changes: 4 additions & 3 deletions roles/cloud_connector/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
path: "/etc/rhc/workers"
owner: root
group: root
mode: 0755
mode: '0755'

- name: Configure rhc-cloud-connector-worker
ansible.builtin.template:
src: "foreman_rh_cloud.toml.j2"
dest: "{{ satellite_cloud_connector_config_file }}"
owner: root
group: root
mode: 0640
mode: '0640'

- name: Create rhcd worker
ansible.builtin.copy:
Expand All @@ -31,7 +31,7 @@
CONFIG_FILE="{{ satellite_cloud_connector_config_file }}" exec /usr/libexec/yggdrasil-worker-forwarder
owner: root
group: root
mode: 0755
mode: '0755'

- name: Ensure rhcd started
ansible.builtin.service:
Expand All @@ -42,6 +42,7 @@
- name: Read client ID from CN of consumer
ansible.builtin.command: openssl x509 -in /etc/pki/consumer/cert.pem -subject -noout
register: cert_output
changed_when: false
when: cert_output is not defined

- name: Set client ID in Satellite
Expand Down
1 change: 1 addition & 0 deletions roles/installer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Run the installer with the `satellite` scenario, setting the initial organizatio
- role: redhat.satellite_operations.installer
vars:
satellite_installer_scenario: satellite
satellite_installer_package: satellite-installer
satellite_installer_options:
- '--foreman-initial-organization "ACME Inc"'
- '--foreman-initial-admin-password changeme'
Expand Down
17 changes: 0 additions & 17 deletions roles/installer/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,6 @@
that:
- satellite_installer_scenario is defined

- name: Enable the ruby module
when:
- ansible_distribution_major_version == '8'
- ansible_os_family == 'RedHat'
block:
- name: Get satellite-installer version
ansible.builtin.dnf:
list: satellite-installer
register: package_info

- name: Enable ruby:2.7 module
ansible.builtin.dnf:
name: '@ruby:2.7'
state: present
when:
- (package_info.results | map(attribute='version') | max) is version("2.5", ">=")

# This is a workaround for https://projects.theforeman.org/issues/34468
- name: "Install hostname"
ansible.builtin.package:
Expand Down

0 comments on commit 1fae25e

Please sign in to comment.