diff --git a/ce-dev/ce-dev.compose.yml b/ce-dev/ce-dev.compose.yml index 78a4ac0f8..227633579 100644 --- a/ce-dev/ce-dev.compose.yml +++ b/ce-dev/ce-dev.compose.yml @@ -7,7 +7,7 @@ x-ce_dev: - ce-dev/ansible/setup.yml services: controller: - image: codeenigma/ce-dev-1.x:devel + image: codeenigma/ce-dev-controller-1.x:devel x-ce_dev: {} volumes: - ../:/home/ce-dev/ce-provision diff --git a/roles/debian/ansible/tasks/main.yml b/roles/debian/ansible/tasks/main.yml index d47d0f5d9..9c7dc523d 100644 --- a/roles/debian/ansible/tasks/main.yml +++ b/roles/debian/ansible/tasks/main.yml @@ -1,27 +1,4 @@ --- -- name: Remove old PPA repository key for Ansible. - ansible.builtin.apt_key: - id: 93C4A3FD7BB9C367 - keyserver: keyserver.ubuntu.com - state: absent - -- name: Remove old repository for Ansible. - ansible.builtin.apt_repository: - repo: "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" - state: absent - -# Linters need a newer version of PyYAML than the one that ships with Debian. -- name: Remove older PyYAML package. - ansible.builtin.apt: - pkg: python3-yaml - state: absent - when: ce_ansible.linters.enabled - -- name: Remove system Ansible. - ansible.builtin.apt: - pkg: ansible - state: absent - - name: Set up Python packages. ansible.builtin.include_role: name: debian/python_common