diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml index 2d3ec4d7e..8fe98e06c 100644 --- a/playbooks/prepare-node-common.yaml +++ b/playbooks/prepare-node-common.yaml @@ -87,35 +87,3 @@ - ruby-dev - zlib1g-dev - python3-pip - - - block: - - name: Set up puppetlabs repo (CentOS/RHEL) - dnf: - name: "https://yum.puppetlabs.com/puppet{{ puppet }}-release-el-{{ ansible_distribution_major_version }}.noarch.rpm" - become: true - - - name: Install puppetlabs puppet-agent (CentOS/RHEL) - dnf: - name: puppet-agent - become: true - - when: - - use_puppetlabs is defined - - use_puppetlabs|bool - - ansible_os_family == 'RedHat' - - - block: - - name: Set up puppetlabs repo (Ubuntu and Debian) - apt: - name: "https://apt.puppetlabs.com/puppet{{ puppet }}-release-{{ ansible_distribution_release }}.deb" - become: true - - - name: Install puppetlabs puppet-agent (Ubuntu and Debian) - apt: - name: puppet-agent - become: true - - when: - - use_puppetlabs is defined - - use_puppetlabs|bool - - ansible_os_family == 'Debian' diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 419844e9e..f80499885 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -115,7 +115,6 @@ nodeset: ubuntu-jammy vars: puppet: 7 - use_puppetlabs: false - job: name: puppet-openstack-module-base