theforeman · evgeni · Jul 9, 2021 · Feb 11, 2021
diff --git a/pipelines/pipeline_katello_lbproxy.yml b/pipelines/pipeline_katello_lbproxy.yml
diff --git a/playbooks/bats_pipeline_katello_nightly.yml b/playbooks/bats_pipeline_katello_nightly.yml
diff --git 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
@@ -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
@@ -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
diff --git a/roles/puppet_repositories/tasks/main.yml b/roles/puppet_repositories/tasks/main.yml
diff --git a/roles/puppet_repositories/tasks/puppetlabs-5-debian.yml b/roles/puppet_repositories/tasks/puppetlabs-5-debian.yml
diff --git a/roles/puppet_repositories/tasks/puppetlabs-5-redhat.yml b/roles/puppet_repositories/tasks/puppetlabs-5-redhat.yml
diff --git a/roles/puppet_repositories/tasks/puppetlabs-6-debian.yml b/roles/puppet_repositories/tasks/puppetlabs-6-debian.yml
diff --git a/roles/puppet_repositories/tasks/puppetlabs-6-redhat.yml b/roles/puppet_repositories/tasks/puppetlabs-6-redhat.yml
diff --git 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'] = {