From cefdcc91ff5464a5e905dec74ff807d3669827d8 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 14 Jun 2020 19:28:34 +0200 Subject: [PATCH 1/5] use python2 docker-compose --- defaults/main.yml | 5 +---- molecule/centos7/converge.yml | 6 +++++- molecule/centos7/requirements.yml | 5 ----- tasks/install.yml | 18 +++++++----------- vars/main.yml | 3 ++- 5 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 molecule/centos7/requirements.yml diff --git a/defaults/main.yml b/defaults/main.yml index 98d1237..4dd47ec 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,14 +3,11 @@ dockerengine_packages: - docker # @var dockerengine_packages_extra:description: > -# The role requires epel repository and pip to work .You can use +# The role requires epel repository and pip to work. You can use # `dockerengine_packages_extra` to install these dependencys. # @end dockerengine_packages_extra: [] -dockerengine_packages_python: - - name: docker-compose - dockerengine_service: docker dockerengine_docker_group_enabled: False diff --git a/molecule/centos7/converge.yml b/molecule/centos7/converge.yml index 550ff1c..4a2edbb 100644 --- a/molecule/centos7/converge.yml +++ b/molecule/centos7/converge.yml @@ -1,6 +1,10 @@ --- - name: Converge hosts: all + vars: + dockerengine_packages_extra: + - epel-release + - python-pip + roles: - - role: xoxys.python3 - role: xoxys.docker_engine diff --git a/molecule/centos7/requirements.yml b/molecule/centos7/requirements.yml deleted file mode 100644 index 9bcadd3..0000000 --- a/molecule/centos7/requirements.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- src: https://gitea.rknet.org/ansible/xoxys.python3.git - name: xoxys.python3 - scm: git - version: master diff --git a/tasks/install.yml b/tasks/install.yml index 0e3148c..b252763 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -1,24 +1,20 @@ --- -- block: +- block: - name: Install dependencies package: name: "{{ item }}" state: present loop: "{{ dockerengine_packages_extra }}" + - name: Install python dependencies + pip: + name: "{{ item }}" + loop: "{{ __docker_ansible_deps }}" + - name: Install packages package: name: "{{ item }}" state: present - loop: "{{ dockerengine_packages + __docker_ansible_deps }}" - - - name: Install python packages - pip: - name: "{{ item.name }}" - executable: "{{ item.exec | default('/usr/bin/pip3') }}" - state: present - loop: "{{ dockerengine_packages_python }}" - loop_control: - label: "{{ item.name }}" + loop: "{{ dockerengine_packages }}" become: True become_user: root diff --git a/vars/main.yml b/vars/main.yml index ec45b5c..67ac0d5 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,4 @@ --- __docker_ansible_deps: - - python-docker-py + - docker-compose~=1.23.0 + - docker From 83e1bea19b58a0609bbb4e2327955076ec83ae4b Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 14 Jun 2020 19:37:10 +0200 Subject: [PATCH 2/5] upgrade docker-compose to v1.24 --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index 67ac0d5..87b900f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ --- __docker_ansible_deps: - - docker-compose~=1.23.0 + - docker-compose~=1.24.0 - docker From 9920f0d478ba40ff9bc6501dfc3b379ced7b17ea Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 15 Jun 2020 08:18:44 +0200 Subject: [PATCH 3/5] allow to configure docker networks --- defaults/main.yml | 17 +++++++++++++++++ tasks/config.yml | 12 ++++++++++++ 2 files changed, 29 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 4dd47ec..1891d32 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -36,3 +36,20 @@ dockerengine_usernamespace_enabled: False dockerengine_nsremap_user: dockremap dockerengine_nsremap_range_start: 231072 dockerengine_nsremap_range_length: 65536 + +# @var dockerengine_networks:description: List of additional docker networks to create. +# @var dockerengine_networks:example: > +# dockerengine_networks: +# - name: my_network +# driver: bridge +# enable_ipv6: True +# ipam_config: +# - subnet: fdd1:ac8c:0557:7ce1::/64 +# force: False +# state: present +# @end +dockerengine_networks: [] +# @var dockerengine_networks:description: > +# List of extra docker networks to create. For configuration detials see `docker_networks`. +# @end +dockerengine_networks_extra: [] diff --git a/tasks/config.yml b/tasks/config.yml index cf97b51..2273576 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -51,6 +51,18 @@ - /etc/subuid - /etc/subgid + - name: Create docker networks + docker_network: + name: "{{ item.name }}" + enable_ipv6: "{{ item.enable_ipv6 | default(False) }}" + ipam_config: "{{ item.ipam_config | default(omit) }}" + force: "{{ item.force | default(omit) }}" + state: "{{ item.state | default('present') }}" + loop: "{{ dockerengine_networks + dockerengine_networks_extra }}" + loop_control: + label: "{{ item.name }}" + notify: __docker_restart + - name: Ensure docker engine is up and running service: name: "{{ dockerengine_service }}" From 87f2cbdd2e45f0ab4620900180a79aa1437f00d0 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 15 Jun 2020 08:23:32 +0200 Subject: [PATCH 4/5] add missing driver option to docker_networks module --- tasks/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/config.yml b/tasks/config.yml index 2273576..f8fca4f 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -54,6 +54,7 @@ - name: Create docker networks docker_network: name: "{{ item.name }}" + driver: "{{ item.driver | default('bridge') }}" enable_ipv6: "{{ item.enable_ipv6 | default(False) }}" ipam_config: "{{ item.ipam_config | default(omit) }}" force: "{{ item.force | default(omit) }}" From 411b417a0872c30f281dc420cbe1510382a2b7b7 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 15 Jun 2020 21:37:21 +0200 Subject: [PATCH 5/5] fix task ordering; ensure docker is running before networks will be created --- tasks/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/config.yml b/tasks/config.yml index f8fca4f..d8fab84 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -51,6 +51,12 @@ - /etc/subuid - /etc/subgid + - name: Ensure docker engine is up and running + service: + name: "{{ dockerengine_service }}" + enabled: True + state: started + - name: Create docker networks docker_network: name: "{{ item.name }}" @@ -63,11 +69,5 @@ loop_control: label: "{{ item.name }}" notify: __docker_restart - - - name: Ensure docker engine is up and running - service: - name: "{{ dockerengine_service }}" - enabled: True - state: started become: True become_user: root