commit d3a69fd0698120996f9240a27dc626e545dd616d
author Zack Williams <zdw@opennetworking.org> Sun May 15 11:52:40 2022 -0700
committer Zack Williams <zdw@opennetworking.org> Thu Jun 02 21:31:09 2022 -0700
tree 5ef84a815aa4fb109bd8501f894d4ff1d002b08f
parent 567879181989f333a74df7f6f4f0f9d1d7e07fe1

Debian 11 updates

Change-Id: I82f1236273afd3547c9de05ef061d7e5246957d7

meta/main.yml

diff --git a/meta/main.yml b/meta/main.yml
index 0b44b1a..5bbf674 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -6,6 +6,8 @@
 
 galaxy_info:
   role_name: nginx
+  namespace: onf
+
   author: Open Networking Foundation
   description: NGINX Web Server
   company: Open Networking Foundation
@@ -14,12 +16,15 @@
 
   license: Apache-2.0
 
-  min_ansible_version: 2.9.5
+  min_ansible_version: 2.10.17
 
   platforms:
-    - name: Ubuntu
+    - name: ubuntu
       versions:
-        - "18.04"
+        - bionic
+    - name: Debian
+      versions:
+        - bullseye
 
   galaxy_tags:
     - nginx

molecule/default/converge.yml

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 791dac6..feb26bf 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -20,7 +20,7 @@
       - name: "authenticated.example.com"
         auth_scope: "mysite"
       - name: "proxy.example.com"
-        proxy_pass: "http://localhost:8000"
+        proxy_pass: "http://127.0.0.1:8000"
       - name: "redirects"
         aliases:
           - "redirect.example.com"

molecule/default/molecule.yml

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 5c40573..6f13222 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -14,6 +14,11 @@
     privileged: true
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - name: "debian-11-priv"
+    image: "onfinfra/molecule-systemd:debian-11"
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
 provisioner:
   name: ansible
 verifier:

molecule/default/verify.yml

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index fbe12ca..1724d69 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -169,23 +169,24 @@
         mode: 0644
         create: true
 
-    - name: Run a python http.server as proxy target for 20 seconds in the background
+    - name: Run a python http.server as proxy target for 30 seconds in the background
+      become: true
       shell: >-
-        (cd /tmp;
-        python3 -m http.server & PY_PID=$!;
+        ( cd /tmp;
+        python3 -m http.server -b 127.0.0.1 8000 2> /tmp/pyhttp.log & PY_PID=$!;
         echo "server running: $PY_PID";
-        sleep 20;
+        sleep 30;
         kill $PY_PID) &
       tags:
         - skip_ansible_lint
 
-    - name: Wait 10 seconds for Python http.server to get started
+    - name: Wait 10 seconds for Python http.server to start
       pause:
         seconds: 10
 
     - name: Test that the proxy site is being served
       uri:
-        url: http://127.0.0.1
+        url: http://127.0.0.1/index.html
         headers:
           Host: "proxy.example.com"
         status_code: 200
@@ -193,10 +194,14 @@
       register: webpage
       failed_when: "'proxy.example.com' not in webpage.content"
 
-    - name: Delete proxy site test file
+    - name: Clean up proxy site testing files
+      become: true
       file:
-        path: "/tmp/index.html"
+        path: "/tmp/{{ item }}"
         state: absent
+      with_items:
+        - "index.html"
+        - "pyhttp.log"
 
     # Redirect tests
     - name: Check that 301 redirect is being served

vars/Debian.yml

diff --git a/vars/Debian.yml b/vars/Debian.yml
index ff3cd40..2e82178 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -10,6 +10,7 @@
 nginx_packages:
   - "nginx"
   - "python3-passlib"
+  - "procps"  # needed as debian initscripts call /bin/kill and others
 
 nginx_username: "www-data"
 nginx_groupname: "www-data"