Fix AZP tests, add current_container_facts module (#48)

* Add new facts module for determining whether the module is running inside a container or not.

* Add containers to main network.

* Fix running tests locally with newer docker.

* Simplify setup_openssl to only install cryptography.

* Add alias in network.

* Make sure to upgrade cryptography to something more sensible on Ubuntu 16.04.

* Don't jump through hoops for bridge.

* Try to use other IPv4 nets.

* Improve module docs.
This commit is contained in:
Felix Fontein
2020-12-13 09:06:16 +01:00
committed by GitHub
parent 4cc4766ddb
commit fe2d52ff29
13 changed files with 168 additions and 49 deletions
@@ -23,10 +23,10 @@
when: docker_py_version is version('1.10.0', '>=')
- set_fact:
subnet_ipv4_base: 192.168.{{ 64 + (192 | random) }}
subnet_ipv4_base: 10.{{ 16 + (240 | random) }}.{{ 16 + (240 | random) }}
subnet_ipv6_base: fdb6:feea:{{ '%0.4x:%0.4x' | format(65536 | random, 65536 | random) }}
# If netaddr would be installed on the controller, one could do:
# subnet_ipv4: "192.168.{{ 64 + (192 | random) }}.0/24"
# subnet_ipv4: "10.{{ 16 + (240 | random) }}.{{ 16 + (240 | random) }}.0/24"
# subnet_ipv6: "fdb6:feea:{{ '%0.4x:%0.4x' | format(65536 | random, 65536 | random) }}::/64"
- set_fact:
@@ -1,7 +1,7 @@
- debug:
msg: Running tests/options-ca.yml
- name: options-ca
when: pyopenssl_version.stdout is version('0.15', '>=') or cryptography_version.stdout is version('1.6', '>=')
when: cryptography_version.stdout is version('1.6', '>=')
block:
- name: Generate privatekey
loop:
@@ -42,4 +42,4 @@
service:
name: docker
state: started
ignore_errors: "{{ ansible_virtualization_type == 'docker' }}"
ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}"
@@ -31,4 +31,4 @@
service:
name: docker
state: started
ignore_errors: "{{ ansible_virtualization_type == 'docker' }}"
ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}"
@@ -135,3 +135,16 @@
images: "{{ docker_images.stdout_lines | default([]) }}"
when: docker_cli_version is version('0.0', '>')
- name: Detect whether we are running inside a container
current_container_facts:
- name: Inspect current container
docker_container_info:
name: "{{ ansible_module_container_id }}"
register: current_container_info
when: ansible_module_running_in_container
- name: Determine network name
set_fact:
current_container_network_ip: "{{ (current_container_info.container.NetworkSettings.Networks | dictsort)[0].0 | default('') if ansible_module_running_in_container else '' }}"
@@ -11,10 +11,18 @@
name: '{{ docker_registry_container_name_frontend }}'
image: "{{ docker_test_image_registry_nginx }}"
ports: 5000
# `links` does not work when using a network. That's why the docker_container task
# in setup.yml specifies `aliases` so we get the same effect.
links:
- '{{ docker_registry_container_name_registry }}:real-registry'
volumes:
- '{{ docker_registry_container_name_frontend }}:/etc/nginx/'
network_mode: '{{ current_container_network_ip | default(omit, true) }}'
networks: >-
{{
[dict([['name', current_container_network_ip]])]
if current_container_network_ip not in ['', 'bridge'] else omit
}}
register: nginx_container
- name: Copy static files into volume
@@ -65,9 +73,17 @@
debug:
var: nginx_container.container.NetworkSettings
- name: Get registry URL
set_fact:
# Note that this host/port combination is used by the Docker daemon, that's why `localhost` is appropriate!
# This host/port combination cannot be used if the tests are running inside a docker container.
docker_registry_frontend_address: localhost:{{ nginx_container.container.NetworkSettings.Ports['5000/tcp'].0.HostPort }}
# The following host/port combination can be used from inside the docker container.
docker_registry_frontend_address_internal: "{{ nginx_container.container.NetworkSettings.Networks[current_container_network_ip].IPAddress if current_container_network_ip else nginx_container.container.NetworkSettings.IPAddress }}:5000"
- name: Wait for registry frontend
uri:
url: https://{{ nginx_container.container.NetworkSettings.IPAddress }}:5000/v2/
url: https://{{ docker_registry_frontend_address_internal }}/v2/
url_username: testuser
url_password: hunter2
validate_certs: false
@@ -76,10 +92,6 @@
retries: 5
delay: 1
- name: Get registry URL
set_fact:
docker_registry_frontend_address: localhost:{{ nginx_container.container.NetworkSettings.Ports['5000/tcp'].0.HostPort }}
- set_fact:
docker_registry_frontend_address: 'n/a'
when: can_copy_files is failed
@@ -44,6 +44,15 @@
name: '{{ docker_registry_container_name_registry }}'
image: "{{ docker_test_image_registry }}"
ports: 5000
network_mode: '{{ current_container_network_ip | default(omit, true) }}'
# We need to define the alias `real-registry` here because the global `links`
# option for the NGINX containers (see setup-frontend.yml) does not work when
# using networks.
networks: >-
{{
[dict([['name', current_container_network_ip], ['aliases', ['real-registry']]])]
if current_container_network_ip not in ['', 'bridge'] else omit
}}
register: registry_container
- name: Get registry URL
@@ -8,39 +8,24 @@
include_vars: '{{ ansible_os_family }}.yml'
when: not ansible_os_family == "Darwin"
- name: Install OpenSSL
become: True
- name: Install cryptography (Python 3)
become: true
package:
name: '{{ openssl_package_name }}'
when: not ansible_os_family == 'Darwin'
name: '{{ cryptography_package_name_python3 }}'
when: ansible_os_family != 'Darwin' and ansible_python_version is version('3.0', '>=')
- name: Install pyOpenSSL (Python 3)
become: True
- name: Install cryptography (Python 2)
become: true
package:
name: '{{ pyopenssl_package_name_python3 }}'
when: not ansible_os_family == 'Darwin' and ansible_python_version is version('3.0', '>=')
name: '{{ cryptography_package_name }}'
when: ansible_os_family != 'Darwin' and ansible_python_version is version('3.0', '<')
- name: Install pyOpenSSL (Python 2)
become: True
package:
name: '{{ pyopenssl_package_name }}'
when: not ansible_os_family == 'Darwin' and ansible_python_version is version('3.0', '<')
- name: Install pyOpenSSL (Darwin)
become: True
- name: Install cryptography (Darwin, and potentially upgrade for other OSes)
become: true
pip:
name: pyOpenSSL
name: cryptography>=1.3.0
extra_args: "-c {{ remote_constraints }}"
when: ansible_os_family == 'Darwin'
- name: register pyOpenSSL version
command: "{{ ansible_python.executable }} -c 'import OpenSSL; print(OpenSSL.__version__)'"
register: pyopenssl_version
- name: register openssl version
shell: "openssl version | cut -d' ' -f2"
register: openssl_version
- name: register cryptography version
- name: Register cryptography version
command: "{{ ansible_python.executable }} -c 'import cryptography; print(cryptography.__version__)'"
register: cryptography_version
@@ -1,3 +1,3 @@
pyopenssl_package_name: python-openssl
pyopenssl_package_name_python3: python3-openssl
openssl_package_name: openssl
---
cryptography_package_name: python-cryptography
cryptography_package_name_python3: python3-cryptography
@@ -1,3 +1,3 @@
pyopenssl_package_name: py27-openssl
pyopenssl_package_name_python3: py36-openssl
openssl_package_name: openssl
---
cryptography_package_name: py27-cryptography
cryptography_package_name_python3: py36-cryptography
@@ -1,3 +1,3 @@
pyopenssl_package_name: pyOpenSSL
pyopenssl_package_name_python3: python3-pyOpenSSL
openssl_package_name: openssl
---
cryptography_package_name: python-cryptography
cryptography_package_name_python3: python3-cryptography
@@ -1,3 +1,3 @@
pyopenssl_package_name: python-pyOpenSSL
pyopenssl_package_name_python3: python3-pyOpenSSL
openssl_package_name: openssl
---
cryptography_package_name: python-cryptography
cryptography_package_name_python3: python3-cryptography