From f2d58a0c506e8e2e344369764128ae218399ccdc Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Thu, 11 Feb 2021 10:31:21 -0500 Subject: [PATCH] Use puppet_repositories from theforeman.operations collection --- pipelines/pipeline_katello_lbproxy.yml | 233 ------------------ playbooks/bats_pipeline_katello_nightly.yml | 27 -- playbooks/luna_demo_environment.yml | 2 +- .../foreman_server_repositories/meta/main.yml | 4 +- .../library/forklift_versions.py | 2 +- roles/puppet_repositories/defaults/main.yml | 2 - roles/puppet_repositories/tasks/main.yml | 4 - .../tasks/puppetlabs-5-debian.yml | 21 -- .../tasks/puppetlabs-5-redhat.yml | 8 - .../tasks/puppetlabs-6-debian.yml | 17 -- .../tasks/puppetlabs-6-redhat.yml | 15 -- vagrant/lib/forklift/box_factory.rb | 2 +- 12 files changed, 5 insertions(+), 332 deletions(-) delete mode 100644 pipelines/pipeline_katello_lbproxy.yml delete mode 100644 playbooks/bats_pipeline_katello_nightly.yml delete mode 100644 roles/puppet_repositories/defaults/main.yml delete mode 100644 roles/puppet_repositories/tasks/main.yml delete mode 100644 roles/puppet_repositories/tasks/puppetlabs-5-debian.yml delete mode 100644 roles/puppet_repositories/tasks/puppetlabs-5-redhat.yml delete mode 100644 roles/puppet_repositories/tasks/puppetlabs-6-debian.yml delete mode 100644 roles/puppet_repositories/tasks/puppetlabs-6-redhat.yml diff --git a/pipelines/pipeline_katello_lbproxy.yml b/pipelines/pipeline_katello_lbproxy.yml deleted file mode 100644 index b6d3e2e78..000000000 --- a/pipelines/pipeline_katello_lbproxy.yml +++ /dev/null @@ -1,233 +0,0 @@ -- hosts: localhost - vars: - forklift_name: pipeline-katello-lbproxy - forklift_boxes: - katello01: - box: centos7 - memory: 8192 - proxy01: - box: centos7 - memory: 3072 - proxy02: - box: centos7 - memory: 3072 - haproxy01: - box: centos7 - memory: 2048 - client01: - box: centos7 - memory: 2048 - roles: - - forklift - -- hosts: - - katello01 - - proxy01 - - proxy02 - - haproxy01 - become: yes - roles: - - umask - - selinux - - etc_hosts - - update_os_packages - - epel_repositories - - haveged - - disable_firewall - -- hosts: - - katello01 - - proxy01 - - proxy02 - become: yes - vars: - foreman_server_repositories_katello: true - puppet_repositories_version: 4 - katello_repositories_version: 3.6 - foreman_repositories_version: 1.17 - foreman_repositories_environment: staging - foreman_installer_skip_installer: true - roles: - - foreman_server_repositories - - foreman_installer - -- hosts: katello01 - become: yes - vars: - foreman_installer_scenario: katello - foreman_installer_disable_system_checks: true - foreman_installer_options_internal_use_only: - - "--foreman-initial-admin-password {{ foreman_installer_admin_password }}" - - "--enable-foreman-plugin-remote-execution" - - "--enable-foreman-proxy-plugin-remote-execution-ssh" - foreman_installer_additional_packages: - - foreman-installer-katello - roles: - - foreman_installer - tasks: - - name: create hostgroup - command: "hammer hostgroup create --name My_Hostgroup --organizations 'Default Organization'" - ignore_errors: True - - name: create ak - command: "hammer activation-key create --name My_Activation_Key --organization 'Default Organization' --lifecycle-environment 'Library' --content-view 'Default Organization View'" - ignore_errors: True - - name: create domain - command: "hammer domain create --name {{ ansible_domain }}" - ignore_errors: True - - name: add domain to org - command: "hammer domain update --name {{ ansible_domain }} --organizations 'Default Organization' --locations 'Default Location'" - ignore_errors: True - -- hosts: - - proxy01 - - proxy02 - become: yes - serial: 1 - vars: - lbname: capsule.example.test - foreman_proxy_content_server: katello01 - foreman_installer_scenario: foreman-proxy-content - foreman_installer_disable_system_checks: true - foreman_installer_options_internal_use_only: - - "--foreman-proxy-trusted-hosts {{ server_fqdn }}" - - "--foreman-proxy-trusted-hosts {{ ansible_nodename }}" - - "--foreman-proxy-foreman-base-url https://{{ server_fqdn }}" - - "--foreman-proxy-oauth-consumer-key {{ oauth_consumer_key }}" - - "--foreman-proxy-oauth-consumer-secret {{ oauth_consumer_secret }}" - - "--foreman-proxy-content-certs-tar {{ foreman_proxy_content_certs_tar }}" - - "{{ '' if (foreman_repositories_version == 'nightly' or 2.3 is version(foreman_repositories_version, '>')) else ('--foreman-proxy-content-parent-fqdn %s' % server_fqdn) }}" - - "--puppet-server-foreman-url https://{{ server_fqdn }}" - - "--puppet-dns-alt-names {{ lbname }}" - - "--puppet-ca-server {{ hostvars['proxy01'].ansible_fqdn }}" - - "--foreman-proxy-puppetca {{ (inventory_hostname == 'proxy01') | ternary('true','false') }}" - - "--puppet-server-ca {{ (inventory_hostname == 'proxy01') | ternary('true','false') }}" - - "--enable-foreman-proxy-plugin-remote-execution-ssh" - foreman_installer_additional_packages: - - foreman-installer-katello - foreman_proxy_content_certs_args: "--foreman-proxy-cname {{ lbname }}" - foreman_installer_custom_hiera: | - pulp::lazy_redirect_host: {{ lbname }} - foreman_proxies: - - proxy01 - - proxy02 - pre_tasks: - - block: - - name: install puppetserver for the puppet user - yum: - name: puppetserver - state: present - - name: create cert folders - file: - path: "/etc/puppetlabs/puppet/ssl/{{ item }}/" - state: directory - mode: 0750 - owner: puppet - group: puppet - with_items: - - ['certs', 'private_keys', 'public_keys'] - - name: copy the CA cert - copy: - src: /tmp/proxycerts/certs/ca.pem - dest: /etc/puppetlabs/puppet/ssl/certs/ca.pem - owner: puppet - group: puppet - - name: copy the prepared puppet certs - copy: - src: "/tmp/proxycerts/{{ item }}/{{ ansible_fqdn }}.pem" - dest: "/etc/puppetlabs/puppet/ssl/{{ item }}/{{ ansible_fqdn }}.pem" - owner: puppet - group: puppet - with_items: - - ['certs', 'private_keys', 'public_keys'] - - name: restore context of /etc/puppetlabs/puppet/ssl/ - command: restorecon -Rv /etc/puppetlabs/puppet/ssl/ - when: - - inventory_hostname != 'proxy01' - roles: - - foreman_proxy_content - - foreman_installer - tasks: - - block: - - name: create certs for the other proxies - command: "puppet cert generate {{ hostvars[item].ansible_fqdn }} --dns_alt_names={{ lbname }}" - environment: - PATH: "/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin:/root/bin" - args: - creates: /etc/puppetlabs/puppet/ssl/certs/{{ hostvars[item].ansible_fqdn }}.pem - with_items: - - proxy02 - - name: fetch the certs - fetch: - src: "/etc/puppetlabs/puppet/ssl/{{ item[0] }}/{{ hostvars[item[1]].ansible_fqdn }}.pem" - dest: "/tmp/proxycerts/{{ item[0] }}/{{ hostvars[item[1]].ansible_fqdn }}.pem" - flat: True - with_nested: - - ['certs', 'private_keys', 'public_keys'] - - ['proxy02'] - - name: fetch the CA cert - fetch: - src: /etc/puppetlabs/puppet/ssl/certs/ca.pem - dest: /tmp/proxycerts/certs/ca.pem - flat: True - when: - - inventory_hostname == 'proxy01' - - name: assign organization and location - command: "hammer proxy update --name {{ ansible_fqdn }} --organizations 'Default Organization' --locations 'Default Location'" - delegate_to: katello01 - -- hosts: - - haproxy01 - become: yes - vars: - foreman_proxies: - - proxy01 - - proxy02 - roles: - - haproxy - -- hosts: - - client01 - become: yes - vars: - lbname: capsule.example.test - roles: - - etc_hosts - - puppet_repositories - - katello_repositories - - disable_firewall - tasks: - - name: discover facts from the other machines - setup: - delegate_to: "{{ item }}" - delegate_facts: yes - with_items: - - haproxy01 - - katello01 - - proxy01 - - proxy02 - - name: add {{ lbname }} hosts entry - lineinfile: - dest: /etc/hosts - line: "{{ hostvars['haproxy01'].ansible_default_ipv4.address }} {{ lbname }}" - - name: add puppet autosign entry - lineinfile: - path: /etc/puppetlabs/puppet/autosign.conf - line: "{{ ansible_fqdn }}" - delegate_to: proxy01 - - name: fetch bootstrap.py - get_url: - url: https://raw.githubusercontent.com/Katello/katello-client-bootstrap/master/bootstrap.py - dest: /root/bootstrap.py - force: True - - name: execute bootstrap.py - command: python /root/bootstrap.py -l admin -p changeme -s {{ lbname }} -o 'Default Organization' -L 'Default Location' -g My_Hostgroup -a My_Activation_Key --unmanaged --puppet-ca-port 8141 - - name: install ssh keys - authorized_key: - user: root - state: present - key: https://{{ hostvars[item].ansible_fqdn }}:9090/ssh/pubkey - validate_certs: False - with_items: - - proxy01 - - proxy02 - - katello01 diff --git a/playbooks/bats_pipeline_katello_nightly.yml b/playbooks/bats_pipeline_katello_nightly.yml deleted file mode 100644 index 9f8960c32..000000000 --- a/playbooks/bats_pipeline_katello_nightly.yml +++ /dev/null @@ -1,27 +0,0 @@ -- hosts: all - become: true - vars: - foreman_server_repositories_katello: true - katello_repositories_version: nightly - foreman_repositories_version: nightly - foreman_repositories_environment: staging - puppet_repositories_version: 5 - foreman_installer_scenario: katello - foreman_installer_additional_packages: - - foreman-installer-katello - foreman_installer_disable_system_checks: true - foreman_installer_options_internal_use_only: - - "--foreman-initial-admin-password {{ foreman_installer_admin_password }}" - - "--puppet-server-max-active-instances 1" - - "--puppet-server-jvm-min-heap-size 1G" - - "--puppet-server-jvm-max-heap-size 1G" - roles: - - umask - - selinux - - etc_hosts - - foreman_server_repositories - - disable_firewall - - haveged - - swapfile - - foreman_installer - - foreman_testing diff --git a/playbooks/luna_demo_environment.yml b/playbooks/luna_demo_environment.yml index 51853a347..332b88165 100644 --- a/playbooks/luna_demo_environment.yml +++ b/playbooks/luna_demo_environment.yml @@ -11,7 +11,7 @@ - etc_hosts - epel_repositories - ostree_repositories - - puppet_repositories + - theforeman.operations.puppet_repositories - foreman_repositories - katello_repositories - foreman_installer diff --git a/roles/foreman_server_repositories/meta/main.yml b/roles/foreman_server_repositories/meta/main.yml index fb0be2670..640bda57f 100644 --- a/roles/foreman_server_repositories/meta/main.yml +++ b/roles/foreman_server_repositories/meta/main.yml @@ -5,10 +5,10 @@ dependencies: - foreman_server_repositories_epel|bool - ansible_distribution_major_version == '7' - role: ansible_repositories - when: + when: - foreman_server_repositories_ansible|bool - ansible_distribution_major_version != '7' - - role: puppet_repositories + - role: theforeman.operations.puppet_repositories when: foreman_server_repositories_puppet|bool - role: foreman_repositories when: foreman_server_repositories_foreman|bool diff --git a/roles/forklift_versions/library/forklift_versions.py b/roles/forklift_versions/library/forklift_versions.py index de7ec3b8f..f912977c2 100644 --- a/roles/forklift_versions/library/forklift_versions.py +++ b/roles/forklift_versions/library/forklift_versions.py @@ -85,7 +85,7 @@ def main(): 'katello_repositories_version': version['katello'], 'katello_repositories_pulp_version': version['pulp'], 'pulp_repositories_version': version['pulp'], - 'puppet_repositories_version': version['puppet'], + 'foreman_puppet_repositories_version': version['puppet'], } if 'pulpcore' in version: forklift_vars['pulpcore_repositories_version'] = version['pulpcore'] diff --git a/roles/puppet_repositories/defaults/main.yml b/roles/puppet_repositories/defaults/main.yml deleted file mode 100644 index cf33124cb..000000000 --- a/roles/puppet_repositories/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -puppet_repositories_version: 6 diff --git a/roles/puppet_repositories/tasks/main.yml b/roles/puppet_repositories/tasks/main.yml deleted file mode 100644 index ebd9d8b9a..000000000 --- a/roles/puppet_repositories/tasks/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: 'Include puppet {{ puppet_repositories_version }} for {{ ansible_os_family }}' - include_tasks: 'puppetlabs-{{ puppet_repositories_version }}-{{ ansible_os_family|lower }}.yml' - when: puppet_repositories_version != false diff --git a/roles/puppet_repositories/tasks/puppetlabs-5-debian.yml b/roles/puppet_repositories/tasks/puppetlabs-5-debian.yml deleted file mode 100644 index ecdfbaf7a..000000000 --- a/roles/puppet_repositories/tasks/puppetlabs-5-debian.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- name: 'Install Puppet GPG key' - apt_key: - url: https://apt.puppet.com/DEB-GPG-KEY-puppet - -- name: 'Install Puppet 5 repository' - apt_repository: - repo: "deb http://apt.puppet.com {{ ansible_distribution_release }} puppet5" - state: present - -- name: 'Install backports' - include_role: - name: 'debian_backports' - when: ansible_distribution_release == "jessie" - -- name: 'Install openjdk-8-jre-headless from backports' - apt: - name: 'openjdk-8-jre-headless' - state: present - default_release: "{{ ansible_distribution_release }}-backports" - when: ansible_distribution_release == "jessie" diff --git a/roles/puppet_repositories/tasks/puppetlabs-5-redhat.yml b/roles/puppet_repositories/tasks/puppetlabs-5-redhat.yml deleted file mode 100644 index 579689153..000000000 --- a/roles/puppet_repositories/tasks/puppetlabs-5-redhat.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: 'Setup Puppet 5 Repository' - yum: - name: https://yum.puppet.com/puppet5-release-el-{{ ansible_distribution_major_version }}.noarch.rpm - disable_gpg_check: True - state: present - tags: - - packages diff --git a/roles/puppet_repositories/tasks/puppetlabs-6-debian.yml b/roles/puppet_repositories/tasks/puppetlabs-6-debian.yml deleted file mode 100644 index 13d817178..000000000 --- a/roles/puppet_repositories/tasks/puppetlabs-6-debian.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: 'Install GPG package' - package: - name: 'gpg' - state: present - tags: - - packages - when: ansible_distribution_release == "buster" - -- name: 'Install Puppet GPG key' - apt_key: - url: https://apt.puppet.com/DEB-GPG-KEY-puppet - -- name: 'Install Puppet 6 repository' - apt_repository: - repo: deb http://apt.puppet.com {{ ansible_distribution_release }} puppet6 - state: present diff --git a/roles/puppet_repositories/tasks/puppetlabs-6-redhat.yml b/roles/puppet_repositories/tasks/puppetlabs-6-redhat.yml deleted file mode 100644 index 94a2dd1b0..000000000 --- a/roles/puppet_repositories/tasks/puppetlabs-6-redhat.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: 'Remove Puppet 5 Repository' - yum: - name: puppet5-release - state: absent - tags: - - packages - -- name: 'Setup Puppet 6 Repository' - yum: - name: https://yum.puppet.com/puppet6-release-el-{{ ansible_distribution_major_version }}.noarch.rpm - disable_gpg_check: True - state: present - tags: - - packages diff --git a/vagrant/lib/forklift/box_factory.rb b/vagrant/lib/forklift/box_factory.rb index 7ca1c6997..fbfbeb060 100644 --- a/vagrant/lib/forklift/box_factory.rb +++ b/vagrant/lib/forklift/box_factory.rb @@ -99,7 +99,7 @@ def build_box(base_box, group, playbook, version) 'katello_repositories_version' => version['katello'], 'katello_repositories_pulp_version' => version['pulp'], 'pulp_repositories_version' => version['pulp'], - 'puppet_repositories_version' => version['puppet'] + 'foreman_puppet_repositories_version' => version['puppet'] ) box['ansible'] = {