Add fedora33 support

Remove fedora31 and add support for fedora33

closes: #7800
https://pulp.plan.io/issues/7800

.github/vars/main.yaml

@@ -9,6 +9,9 @@ molecule_images:
   - name: fedora-31
     image: fedora:31
     command: /usr/sbin/init
+  - name: fedora-33
+    image: fedora:33
+    command: /usr/sbin/init
   - name: debian-10
     image: debian:10
     command: /sbin/init

CHANGES/7800.feature

@@ -0,0 +1 @@
+Add support for Fedora 33.

molecule/release-dynamic/molecule.yml

@@ -38,8 +38,8 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
 provisioner:
   name: ansible

molecule/release-static/molecule.yml

@@ -23,7 +23,7 @@ lint: |
   capabilities:
     - NET_ADMIN
     - NET_RAW
-  pre_build_image: true
+  pre_build_image: false
 platforms:
   - <<: *platform_base
     name: centos-7
@@ -38,9 +38,10 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
+    memory: 4096M
 provisioner:
   name: ansible
   config_options:

molecule/scenario_resources/Dockerfile.j2

@@ -61,6 +61,7 @@ dnf --assumeyes install \
   bash \
   jemalloc \
   glibc-langpack-en \
+  libxcrypt-compat \
   python3 \
   python3-dnf \
   python3-setuptools \
@@ -69,6 +70,7 @@ dnf --assumeyes install \
   sudo \
   which \
   &&\
+dnf remove httpd --assumeyes && \
 dnf clean all
 {%- endif %}
 

molecule/source-dynamic/molecule.yml

@@ -38,8 +38,8 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
 provisioner:
   name: ansible

molecule/source-static/molecule.yml

@@ -38,8 +38,8 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
 provisioner:
   name: ansible

requirements.yml

@@ -1,5 +1,8 @@
 ---
 roles:
-  - geerlingguy.postgresql
+  - name: geerlingguy.postgresql
+    src: https://github.com/wzzrd/ansible-role-postgresql.git
+    version: add-fedora-33-support
+
 collections:
   - ansible.posix

roles/pulp_all_services/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_api/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_common/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_common/tasks/repos.yml

@@ -85,11 +85,12 @@
 
 # Corresponds to the rhel8+ CodeReady Linux Builder repo
 # Foreman reminds you to wear a yellow hardhat when using power tools.
+# On our box PowerTool repo is lower case
 - name: Enable the CentOS PowerTools repo
   block:
 
     - name: Determine which file in /etc/yum.repos.d/ has the CentOS 8.0 to 8.2 PowerTools repo
-      shell: grep -l -E "^\[PowerTools\]" /etc/yum.repos.d/*.repo
+      shell: grep -l -E "^\[powertools\]" /etc/yum.repos.d/*.repo
       register: repo_file
       changed_when: false
       failed_when: false
@@ -98,7 +99,7 @@
     - name: Enable the CentOS PowerTools repo
       ini_file:
         path: "{{ repo_file.stdout }}"
-        section: "PowerTools"
+        section: "powertools"
         option: enabled
         value: "1"
         no_extra_spaces: true

roles/pulp_content/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_database/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_database_config/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_devel/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_health_check/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_redis/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_redis/vars/Fedora-33.yml

@@ -0,0 +1,3 @@
+---
+_pulp_redis_server_name: redis
+_pulp_redis_conf_file: '/etc/redis/redis.conf'

roles/pulp_resource_manager/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_rpm_prerequisites/meta/main.yml

@@ -15,8 +15,8 @@ galaxy_info:
   platforms:
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_services/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_webserver/handlers/main.yml

@@ -13,6 +13,12 @@
     daemon_reload: true
   become: true
 
+- name: reload firewall
+  systemd:
+    name: firewalld
+    state: reloaded
+  become: true
+
 - name: update ca trust
   command: "{{ pulp_webserver_trusted_root_certificates_update_bin }}"
   become: true

roles/pulp_webserver/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_webserver/tasks/firewalld.yml

@@ -19,19 +19,22 @@
         state: started
         enabled: true
 
+    # not using immediate: true as causes error https://bugzilla.redhat.com/show_bug.cgi?id=1817205
     - name: Accept HTTP connections on port {{ pulp_webserver_http_port }}
       firewalld:
         port: '{{ pulp_webserver_http_port }}/tcp'
         permanent: true
-        immediate: true
         state: enabled
+        zone: public
+      notify: reload firewall
 
     - name: Accept HTTPS connections on port {{ pulp_webserver_https_port }}
       firewalld:
         port: '{{ pulp_webserver_https_port }}/tcp'
         permanent: true
-        immediate: true
         state: enabled
+        zone: public
       when: not pulp_webserver_disable_https | bool
+      notify: reload firewall
 
   become: true

roles/pulp_workers/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

vagrant/boxes.d/00-fedora.yaml

@@ -1,14 +1,14 @@
-fedora31:
-  box_name: 'fedora/31-cloud-base'
-  image_name: !ruby/regexp '/Fedora 31.*/'
+fedora32:
+  box_name: 'fedora/32-cloud-base'
+  image_name: !ruby/regexp '/Fedora 32.*/'
   pty: true
   ansible:
     variables:
       ansible_python_interpreter: /usr/bin/python3
 
-fedora32:
-  box_name: 'fedora/32-cloud-base'
-  image_name: !ruby/regexp '/Fedora 32.*/'
+fedora33:
+  box_name: 'fedora/33-cloud-base'
+  image_name: !ruby/regexp '/Fedora 33.*/'
   pty: true
   ansible:
     variables:

vagrant/boxes.d/20-sandbox.yaml

@@ -1,12 +1,12 @@
-pulp3-sandbox-fedora31:
-  box: 'fedora31'
+pulp3-sandbox-fedora32:
+  box: 'fedora32'
   memory: 4096
   ansible:
     playbook: "vagrant/playbooks/user-sandbox.yml"
     galaxy_role_file: "requirements.yml"
 
-pulp3-sandbox-fedora32:
-  box: 'fedora32'
+pulp3-sandbox-fedora33:
+  box: 'fedora33'
   memory: 4096
   ansible:
     playbook: "vagrant/playbooks/user-sandbox.yml"

vagrant/boxes.d/30-source.yaml

@@ -1,5 +1,5 @@
-pulp3-source-fedora31:
-  box: 'fedora31'
+pulp3-source-fedora32:
+  box: 'fedora32'
   sshfs:
     host_path: '..'
     guest_path: '/home/vagrant/devel'
@@ -9,8 +9,8 @@ pulp3-source-fedora31:
     playbook: "vagrant/playbooks/source-install.yml"
     galaxy_role_file: "requirements.yml"
 
-pulp3-source-fedora32:
-  box: 'fedora32'
+pulp3-source-fedora33:
+  box: 'fedora33'
   sshfs:
     host_path: '..'
     guest_path: '/home/vagrant/devel'