Problem: README.md & example yml's are out of date

Solution: Update them, including for pulp_rpm_prerequisites being in pulp_install_plugins / prereq_role re: #5518 Problem: Running include_roles with pulp_rpm_prerequisites causes it to fail https://pulp.plan.io/issues/5518 [noissue]
pulp · Oct 1, 2019 · 7b5a79f · 7b5a79f
1 parent 2835fe6
commit 7b5a79f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -44,13 +44,25 @@ upon what is available from [ansible-pulp](https://github.com/pulp/ansible-pulp)
 supported boxes:
 
 ```
-centos7                   not created (libvirt)
-centos7-fips              not created (libvirt)
-fedora30                  not created (libvirt)
-pulp3-sandbox-centos7     not created (libvirt)
-pulp3-sandbox-fedora30    not created (libvirt)
-pulp3-source-centos7      not created (libvirt)
-pulp3-source-fedora30     not created (libvirt)
+centos7                            not created (libvirt)
+centos7-fips                       not created (libvirt)
+debian10                           not created (libvirt)
+fedora28                           not created (libvirt)
+fedora29                           not created (libvirt)
+fedora30                           not created (libvirt)
+pulp2-nightly-pulp3-source-centos7 not created (libvirt)
+pulp3-sandbox-centos7              not created (libvirt)
+pulp3-sandbox-centos7-fips         not created (libvirt)
+pulp3-sandbox-debian10             not created (libvirt)
+pulp3-sandbox-fedora28             not created (libvirt)
+pulp3-sandbox-fedora29             not created (libvirt)
+pulp3-sandbox-fedora30             not created (libvirt)
+pulp3-source-centos7               not created (libvirt)
+pulp3-source-centos7-fips          not created (libvirt)
+pulp3-source-debian10              not created (libvirt)
+pulp3-source-fedora28              not created (libvirt)
+pulp3-source-fedora29              not created (libvirt)
+pulp3-source-fedora30              not created (libvirt)
 ```
 
 #### Base Boxes

diff --git a/example.dev-config.yml b/example.dev-config.yml
@@ -3,25 +3,25 @@ pulp_devel_supplement_bashrc: true
 pulp_default_admin_password: password
 pulp_install_plugins:
   # pulp-ansible:
-  #   app_label: "ansible"
   #   source_dir: "/home/vagrant/devel/pulp_ansible"
   # pulp-certguard:
-  #   app_label: "certguard"
   #   source_dir: "/home/vagrant/devel/pulp-certguard"
+  # pulp-cookbook:
+  #   source_dir: "/home/vagrant/devel/pulp_cookbook"
   # pulp-deb:
-  #   app_label: "deb"
   #   source_dir: "/home/vagrant/devel/pulp_deb"
   # pulp-docker:
-  #   app_label: "docker"
   #   source_dir: "/home/vagrant/devel/pulp_docker"
+  # pulp-gem:
+  #   source_dir: "/home/vagrant/devel/pulp_gem"
+  # pulp-maven:
+  #   source_dir: "/home/vagrant/devel/pulp_maven"
   # pulp-python:
-  #   app_label: "python"
   #   source_dir: "/home/vagrant/devel/pulp_python"
   # pulp-rpm:
-  #   app_label: "rpm"
   #   source_dir: "/home/vagrant/devel/pulp_rpm"
+  #   prereq_role: "/home/vagrant/devel/pulp-rpm-prerequisites"
   pulp-file:
-    app_label: "file"
     source_dir: "/home/vagrant/devel/pulp_file"
 
 # Vagrant source install Required

diff --git a/example.user-config.yml b/example.user-config.yml
@@ -1,18 +1,15 @@
 pulp_default_admin_password: password
 pulp_install_plugins:
-  # pulp-ansible:
-  #   app_label: "ansible"
-  # pulp-certguard:
-  #   app_label: "certguard"
-  # pulp-deb:
-  #   app_label: "deb"
-  # pulp-docker:
-  #   app_label: "docker"
-  # pulp-python:
-  #   app_label: "python"
+  # pulp-ansible: {}
+  # pulp-certguard: {}
+  # pulp-cookbook: {}
+  # pulp-deb: {}
+  # pulp-docker: {}
+  # pulp-gem: {}
+  # pulp-maven: {}
+  # pulp-python: {}
   # pulp-rpm:
-  #   app_label: "rpm"
-  pulp-file:
-    app_label: "file"
+  #   prereq_role: "/home/vagrant/devel/pulp-rpm-prerequisites"
+  pulp-file: {}
 pulp_settings:
   secret_key: "unsafe_default"