Adding upstream version 2.10.7+merged+base+2.10.8+dfsg.upstream/2.10.7+merged+base+2.10.8+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 405 insertions, 0 deletions

diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/Dockerfile.j2 b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/Dockerfile.j2
new file mode 100644
index 00000000..5c2401ca
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/Dockerfile.j2
@@ -0,0 +1,111 @@
+# Molecule managed
+
+{% if item.registry is defined %}
+FROM {{ item.registry.url }}/{{ item.image }}
+{% else %}
+FROM {{ item.image }}
+{% endif %}
+ENV container=docker
+
+{# Initial Package Installs and Container Prep #}
+{% if item.image.split(':', 1)[0] in ["ubuntu"] %}
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+     locales software-properties-common rsyslog systemd systemd-cron sudo \
+     iproute2
+RUN sed -i 's/^\($ModLoad imklog\)/#\1/' /etc/rsyslog.conf
+{% elif item.image.split(':', 1)[0] in ["debian"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       sudo systemd systemd-sysv \
+       build-essential wget
+{% elif item.image.split(':', 1)[0] in ["centos"] %}
+{% if item.image in ["centos:7"] %}
+RUN yum makecache fast && yum -y install deltarpm \
+{% elif item.image in ["centos:8"] %}
+RUN yum makecache --timer \
+{% endif %}
+    && yum -y install epel-release \
+    && yum -y update \
+    && yum -y install sudo which
+{% endif %}
+
+
+{# Install of Python2 #}
+{% if item.image in ["ubuntu:16.04"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends python-setuptools wget \
+    && wget https://bootstrap.pypa.io/get-pip.py \
+    && python get-pip.py
+{% elif item.image in ["debian:9"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends libffi-dev libssl-dev \
+       python-pip python-dev python-setuptools python-wheel
+{% elif item.image in ["centos:7"] %}
+RUN yum -y install python-pip
+{% endif %}
+
+{# Install of Python3 #}
+{% if item.image in ["ubuntu:18.04", "ubuntu:20.04", "debian:10"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       apt-utils python3-setuptools python3-pip
+{% endif %}
+{% if item.image in ["centos:8"] %}
+RUN yum -y install hostname python3 python3-pip
+{% endif %}
+
+{# Steps for cleanup #}
+{% if item.image.split(':', 1)[0] in ["ubuntu", "debian"] %}
+RUN rm -Rf /var/lib/apt/lists/* \
+    && rm -Rf /usr/share/doc && rm -Rf /usr/share/man \
+    && apt-get clean
+{% elif item.image.split(':', 1)[0] in ["centos"] %}
+RUN yum clean all
+{% endif %}
+
+{# Steps for clenaup of systemd #}
+{% if item.image in ["centos:7", "centos:8", "debian:9"] %}
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
+  systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+  rm -f /lib/systemd/system/multi-user.target.wants/*;\
+  rm -f /etc/systemd/system/*.wants/*;\
+  rm -f /lib/systemd/system/local-fs.target.wants/*; \
+  rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+  rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+  rm -f /lib/systemd/system/basic.target.wants/*;\
+  rm -f /lib/systemd/system/anaconda.target.wants/*; \
+  mkdir -p /run/systemd/system
+{% endif %}
+{% if item.image in ["ubuntu:18.04", "ubuntu:20.04"] %}
+# Remove unnecessary getty and udev targets that result in high CPU usage when using
+# multiple containers with Molecule (https://github.com/ansible/molecule/issues/1104)
+RUN rm -f /lib/systemd/system/systemd*udev* \
+  && rm -f /lib/systemd/system/getty.target
+{% endif %}
+
+
+{% if item.image in ["centos:7", "centos:8"] %}
+# Disable requiretty.
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+{% endif %}
+
+{% if item.image.split(':', 1)[0] not in ["centos", "debian"] %}
+# Fix potential UTF-8 errors with ansible-test.
+RUN locale-gen en_US.UTF-8
+{% endif %}
+
+# Install Ansible inventory file.
+RUN mkdir -p /etc/ansible
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
+
+{% if item.image in ["centos:7", "centos:8", "debian:9", "debian:10"] %}
+VOLUME ["/sys/fs/cgroup"]
+{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04"] %}
+VOLUME ["/sys/fs/cgroup", "/tmp", "/run"]
+{% endif %}
+{% if item.image in ["centos:7", "centos:8"] %}
+CMD ["/usr/sbin/init"]
+{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04", "debian:9", "debian:10"] %}
+CMD ["/lib/systemd/systemd"]
+{% endif %}
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/archive_playbook.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/archive_playbook.yml
new file mode 100644
index 00000000..52ab0de4
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/archive_playbook.yml
@@ -0,0 +1,15 @@
+---
+- name: Converge
+  hosts: all
+  pre_tasks:
+    - name: Install gpg for apt_key
+      apt:
+        name: gnupg
+        update_cache: true
+      when: ansible_os_family|lower == "debian"
+  roles:
+    - role: google.cloud.gcloud
+      gcloud_install_type: archive
+      gcloud_command_completion: true
+      gcloud_additional_components:
+        - cloud-build-local
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/converge.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/converge.yml
new file mode 100644
index 00000000..6889b4bb
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/converge.yml
@@ -0,0 +1,23 @@
+---
+- name: Converge
+  hosts: all
+  pre_tasks:
+    - name: Update package cache
+      package: update_cache=yes
+      changed_when: false
+      register: task_result
+      until: task_result is success
+      retries: 10
+      delay: 2
+    - name: create containerd folder
+      file:
+        path: /etc/systemd/system/containerd.service.d
+        state: directory
+      when: ansible_service_mgr == "systemd"
+    - name: override file for containerd
+      copy:
+        src: files/override.conf
+        dest: /etc/systemd/system/containerd.service.d/override.conf
+      when: ansible_service_mgr == "systemd"
+  roles:
+    - role: google.cloud.gcloud
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/files/override.conf b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/files/override.conf
new file mode 100644
index 00000000..76864e20
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/files/override.conf
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPre=
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/molecule.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/molecule.yml
new file mode 100644
index 00000000..da1ce651
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/molecule.yml
@@ -0,0 +1,20 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+platforms:
+  - name: instance
+    image: ${MOLECULE_DISTRO:-ubuntu:xenial}
+    privileged: true
+    command: ${MOLECULE_COMMAND:-"sleep infinity"}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/package_playbook.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/package_playbook.yml
new file mode 100644
index 00000000..fab1d857
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/package_playbook.yml
@@ -0,0 +1,13 @@
+---
+- name: Converge
+  hosts: all
+  pre_tasks:
+    - name: Install gpg for apt_key
+      apt:
+        name: gnupg
+        update_cache: true
+      when: ansible_os_family|lower == "debian"
+  roles:
+    - role: google.cloud.gcloud
+      gcloud_additional_components:
+        - cloud-build-local
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/tests/test_default.py b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/tests/test_default.py
new file mode 100644
index 00000000..bb43defb
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/tests/test_default.py
@@ -0,0 +1,23 @@
+from __future__ import (absolute_import, division, print_function)
+import os
+import testinfra.utils.ansible_runner
+
+__metaclass__ = type
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_service(host):
+    service = host.service('docker')
+
+    assert service.is_running
+    assert service.is_enabled
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/verify.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/verify.yml
new file mode 100644
index 00000000..a82dd6fd
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcloud/verify.yml
@@ -0,0 +1,9 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  tasks:
+  - name: Example assertion
+    assert:
+      that: true
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/Dockerfile.j2 b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/Dockerfile.j2
new file mode 100644
index 00000000..5c2401ca
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/Dockerfile.j2
@@ -0,0 +1,111 @@
+# Molecule managed
+
+{% if item.registry is defined %}
+FROM {{ item.registry.url }}/{{ item.image }}
+{% else %}
+FROM {{ item.image }}
+{% endif %}
+ENV container=docker
+
+{# Initial Package Installs and Container Prep #}
+{% if item.image.split(':', 1)[0] in ["ubuntu"] %}
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+     locales software-properties-common rsyslog systemd systemd-cron sudo \
+     iproute2
+RUN sed -i 's/^\($ModLoad imklog\)/#\1/' /etc/rsyslog.conf
+{% elif item.image.split(':', 1)[0] in ["debian"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       sudo systemd systemd-sysv \
+       build-essential wget
+{% elif item.image.split(':', 1)[0] in ["centos"] %}
+{% if item.image in ["centos:7"] %}
+RUN yum makecache fast && yum -y install deltarpm \
+{% elif item.image in ["centos:8"] %}
+RUN yum makecache --timer \
+{% endif %}
+    && yum -y install epel-release \
+    && yum -y update \
+    && yum -y install sudo which
+{% endif %}
+
+
+{# Install of Python2 #}
+{% if item.image in ["ubuntu:16.04"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends python-setuptools wget \
+    && wget https://bootstrap.pypa.io/get-pip.py \
+    && python get-pip.py
+{% elif item.image in ["debian:9"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends libffi-dev libssl-dev \
+       python-pip python-dev python-setuptools python-wheel
+{% elif item.image in ["centos:7"] %}
+RUN yum -y install python-pip
+{% endif %}
+
+{# Install of Python3 #}
+{% if item.image in ["ubuntu:18.04", "ubuntu:20.04", "debian:10"] %}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       apt-utils python3-setuptools python3-pip
+{% endif %}
+{% if item.image in ["centos:8"] %}
+RUN yum -y install hostname python3 python3-pip
+{% endif %}
+
+{# Steps for cleanup #}
+{% if item.image.split(':', 1)[0] in ["ubuntu", "debian"] %}
+RUN rm -Rf /var/lib/apt/lists/* \
+    && rm -Rf /usr/share/doc && rm -Rf /usr/share/man \
+    && apt-get clean
+{% elif item.image.split(':', 1)[0] in ["centos"] %}
+RUN yum clean all
+{% endif %}
+
+{# Steps for clenaup of systemd #}
+{% if item.image in ["centos:7", "centos:8", "debian:9"] %}
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
+  systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+  rm -f /lib/systemd/system/multi-user.target.wants/*;\
+  rm -f /etc/systemd/system/*.wants/*;\
+  rm -f /lib/systemd/system/local-fs.target.wants/*; \
+  rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+  rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+  rm -f /lib/systemd/system/basic.target.wants/*;\
+  rm -f /lib/systemd/system/anaconda.target.wants/*; \
+  mkdir -p /run/systemd/system
+{% endif %}
+{% if item.image in ["ubuntu:18.04", "ubuntu:20.04"] %}
+# Remove unnecessary getty and udev targets that result in high CPU usage when using
+# multiple containers with Molecule (https://github.com/ansible/molecule/issues/1104)
+RUN rm -f /lib/systemd/system/systemd*udev* \
+  && rm -f /lib/systemd/system/getty.target
+{% endif %}
+
+
+{% if item.image in ["centos:7", "centos:8"] %}
+# Disable requiretty.
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+{% endif %}
+
+{% if item.image.split(':', 1)[0] not in ["centos", "debian"] %}
+# Fix potential UTF-8 errors with ansible-test.
+RUN locale-gen en_US.UTF-8
+{% endif %}
+
+# Install Ansible inventory file.
+RUN mkdir -p /etc/ansible
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
+
+{% if item.image in ["centos:7", "centos:8", "debian:9", "debian:10"] %}
+VOLUME ["/sys/fs/cgroup"]
+{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04"] %}
+VOLUME ["/sys/fs/cgroup", "/tmp", "/run"]
+{% endif %}
+{% if item.image in ["centos:7", "centos:8"] %}
+CMD ["/usr/sbin/init"]
+{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04", "debian:9", "debian:10"] %}
+CMD ["/lib/systemd/systemd"]
+{% endif %}
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/converge.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/converge.yml
new file mode 100644
index 00000000..f4c2bcea
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/converge.yml
@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  pre_tasks:
+    - name: Using apt update the packages
+      apt:
+        update_cache: yes
+      when: ansible_os_family == "Debian"
+    - name: Using apt update the packages
+      yum:
+        update_cache: yes
+      when: ansible_os_family == "RedHat"
+    - name: create containerd folder
+      file:
+        path: /etc/systemd/system/containerd.service.d
+        state: directory
+      when: ansible_service_mgr == "systemd"
+    - name: override file for containerd
+      copy:
+        src: files/override.conf
+        dest: /etc/systemd/system/containerd.service.d/override.conf
+      when: ansible_service_mgr == "systemd"
+  roles:
+    - role: google.cloud.gcsfuse
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/files/override.conf b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/files/override.conf
new file mode 100644
index 00000000..76864e20
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/files/override.conf
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPre=
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/molecule.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/molecule.yml
new file mode 100644
index 00000000..da1ce651
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/molecule.yml
@@ -0,0 +1,20 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+platforms:
+  - name: instance
+    image: ${MOLECULE_DISTRO:-ubuntu:xenial}
+    privileged: true
+    command: ${MOLECULE_COMMAND:-"sleep infinity"}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/tests/test_default.py b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/tests/test_default.py
new file mode 100644
index 00000000..bb43defb
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/tests/test_default.py
@@ -0,0 +1,23 @@
+from __future__ import (absolute_import, division, print_function)
+import os
+import testinfra.utils.ansible_runner
+
+__metaclass__ = type
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_service(host):
+    service = host.service('docker')
+
+    assert service.is_running
+    assert service.is_enabled
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/verify.yml b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/verify.yml
new file mode 100644
index 00000000..a82dd6fd
--- /dev/null
+++ b/collections-debian-merged/ansible_collections/google/cloud/molecule/gcsfuse/verify.yml
@@ -0,0 +1,9 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  tasks:
+  - name: Example assertion
+    assert:
+      that: true