Merge "Update to new quay.io images"

tripleo_ipa/molecule/default/Dockerfile

@@ -30,7 +30,7 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 
 {% for pkg in item.easy_install | default([]) %}
 # install pip for centos where there is no python-pip rpm in default repos
-RUN easy_install {{ pkg }}
+RUN pip install {{ pkg }}
 {% endfor %}
 
 

tripleo_ipa/molecule/default/converge.yml

@@ -15,7 +15,7 @@
 # under the License.
 
 - name: Setup server
-  hosts: centos8
+  hosts: centos9
   vars:
     ipa_domain: example.test
     ipa_server_ip: 10.88.0.22
@@ -24,15 +24,6 @@
     ipa_server_hostname: ipa.example.test
     undercloud_fqdn: test-0.example.test
   tasks:
-    - name: install python urllib gssapi
-      pip:
-        name: urllib_gssapi
-
-    - name: install ipa client
-      package:
-        name: ipa-client
-        state: present
-
     - name: set resolv.conf to point to the ipa server
       shell:
         cmd: cat > /etc/resolv.conf
@@ -92,7 +83,7 @@
 
 
 - name: Setup dummy server
-  hosts: centos8-dummy
+  hosts: centos9-dummy
   vars:
     ipa_domain: example.test
     ipa_server_ip: 10.88.0.22
@@ -101,15 +92,6 @@
     ipa_server_hostname: ipa.example.test
     undercloud_fqdn: dummy.example.test
   tasks:
-    - name: install python urllib gssapi
-      pip:
-        name: urllib_gssapi
-
-    - name: install ipa client
-      package:
-        name: ipa-client
-        state: present
-
     - name: set resolv.conf to point to the ipa server
       shell:
         cmd: cat > /etc/resolv.conf
@@ -162,7 +144,7 @@
 
 
 - name: Converge - add host and relevant services
-  hosts: centos8
+  hosts: centos9
   vars:
     tripleo_ipa_enroll_base_server: true
     tripleo_ipa_base_server_fqdn: test-0.example.test
@@ -226,7 +208,7 @@
 
 
 - name: Converge - add dns entries
-  hosts: centos8
+  hosts: centos9
   vars:
     cloud_domain: ooo.test
     hosts_entry:

tripleo_ipa/molecule/default/molecule.yml

@@ -1,15 +1,19 @@
 ---
 driver:
   name: podman
+
 log: true
 
 platforms:
-  - name: centos8
+  - name: centos9
     hostname: test-0.example.test
-    image: centos/centos:stream8
+    image: centos/centos:stream9
     registry:
       url: quay.io
     command: /sbin/init
+    pkg_extras: systemd ipa-client pip
+    easy_install:
+      - urllib_gssapi
     tmpfs:
       - /run
       - /tmp
@@ -22,12 +26,15 @@ platforms:
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
 
-  - name: centos8-dummy
+  - name: centos9-dummy
     hostname: dummy.example.test
-    image: centos/centos:stream8
+    image: centos/centos:stream9
     registry:
       url: quay.io
     command: /sbin/init
+    pkg_extras: systemd ipa-client pip
+    easy_install:
+      - urllib_gssapi
     tmpfs:
       - /run
       - /tmp
@@ -50,9 +57,9 @@ provisioner:
     hosts:
       all:
         hosts:
-          centos8:
+          centos9:
             ansible_python_interpreter: /usr/bin/python3
-          centos8-dummy:
+          centos9-dummy:
             ansible_python_interpreter: /usr/bin/python3
 
 scenario:

tripleo_ipa/molecule/default/prepare.yml

@@ -24,7 +24,7 @@
 
     - name: Download FreeIPA Container
       containers.podman.podman_image:
-        name: docker.io/freeipa/freeipa-server:fedora-28
+        name: quay.io/freeipa/freeipa-server:fedora-36
         pull: true
       become: true
 
@@ -61,8 +61,9 @@
         -h ipa.{{ domain }}
         --read-only --tmpfs /run --tmpfs /tmp
         -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-        -v /tmp/ipa-data:/data:Z freeipa/freeipa-server:fedora-28 no-exit
+        -v /tmp/ipa-data:/data:Z freeipa/freeipa-server:fedora-36 no-exit
         -U -r {{ domain | upper }} --setup-dns --no-reverse --no-ntp
+        --no-dnssec-validation
         --forwarder={{ nameservers[0] | default('8.8.8.8') }}
       vars:
         nameservers: "{{ nmcli_device_show.stdout | regex_findall('\\s*IP4.DNS\\[.\\]:\\s*(.*)') }}"

tripleo_ipa/molecule/default/tests/test_default.py

@@ -7,7 +7,7 @@ import testinfra.utils.ansible_runner
 
 inventory = os.environ['MOLECULE_INVENTORY_FILE']
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    inventory).get_hosts('centos8')
+    inventory).get_hosts('centos9')
 
 
 def setup_module(module):

tripleo_ipa/molecule/default/verify.yml

@@ -2,7 +2,7 @@
 # This is an example playbook to execute Ansible tests.
 
 - name: Verify
-  hosts: centos8
+  hosts: centos9
   tasks:
   - name: Example assertion
     assert:

tripleo_ipa/molecule/deregister/Dockerfile

@@ -30,7 +30,7 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 
 {% for pkg in item.easy_install | default([]) %}
 # install pip for centos where there is no python-pip rpm in default repos
-RUN easy_install {{ pkg }}
+RUN pip install {{ pkg }}
 {% endfor %}
 
 

tripleo_ipa/molecule/deregister/converge.yml

@@ -24,21 +24,6 @@
     ipa_server_hostname: ipa.example.test
     undercloud_fqdn: test-0.example.test
   tasks:
-    - name: copy requirements file
-      copy:
-        src: "{{ playbook_dir }}/../../../requirements.txt"
-        dest: /tmp/requirements.txt
-    - name: install requirements
-      pip:
-        requirements: /tmp/requirements.txt
-    - name: install python urllib gssapi
-      pip:
-        name: urllib_gssapi
-    - name: install ipa client
-      package:
-        name: ipa-client
-        state: present
-
     - name: set resolv.conf to point to the ipa server
       shell:
         cmd: cat > /etc/resolv.conf

tripleo_ipa/molecule/deregister/molecule.yml

@@ -5,12 +5,15 @@ driver:
 log: true
 
 platforms:
-  - name: centos8
+  - name: centos9
     hostname: test-0.example.test
-    image: centos/centos:stream8
+    image: centos/centos:stream9
     registry:
       url: quay.io
     command: /sbin/init
+    pkg_extras: systemd ipa-client pip
+    easy_install:
+      - urllib_gssapi
     tmpfs:
       - /run
       - /tmp
@@ -35,7 +38,7 @@ provisioner:
     hosts:
       all:
         hosts:
-          centos8:
+          centos9:
             ansible_python_interpreter: /usr/bin/python3
 
 scenario:

tripleo_ipa/molecule/deregister/prepare.yml

@@ -24,7 +24,7 @@
 
     - name: Download FreeIPA Container
       containers.podman.podman_image:
-        name: docker.io/freeipa/freeipa-server:fedora-28
+        name: quay.io/freeipa/freeipa-server:fedora-36
         pull: true
       become: true
 
@@ -61,8 +61,9 @@
         -h ipa.{{ domain }}
         --read-only --tmpfs /run --tmpfs /tmp
         -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-        -v /tmp/ipa-data:/data:Z freeipa/freeipa-server:fedora-28 exit-on-finished
+        -v /tmp/ipa-data:/data:Z freeipa/freeipa-server:fedora-36 exit-on-finished
         -U -r {{ domain | upper }} --setup-dns --no-reverse --no-ntp
+        --no-dnssec-validation
         --forwarder={{ nameservers[0] | default('8.8.8.8') }}
       vars:
         nameservers: "{{ nmcli_device_show.stdout | regex_findall('\\s*IP4.DNS\\[.\\]:\\s*(.*)') }}"