diff --git a/defaults/main.yml b/defaults/main.yml index 98d1237..1891d32 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 @@ -39,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/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/config.yml b/tasks/config.yml index cf97b51..d8fab84 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -56,5 +56,18 @@ name: "{{ dockerengine_service }}" enabled: True state: started + + - 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) }}" + state: "{{ item.state | default('present') }}" + loop: "{{ dockerengine_networks + dockerengine_networks_extra }}" + loop_control: + label: "{{ item.name }}" + notify: __docker_restart become: True become_user: root 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..87b900f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,4 @@ --- __docker_ansible_deps: - - python-docker-py + - docker-compose~=1.24.0 + - docker