diff --git a/defaults/main.yml b/defaults/main.yml index ea65461..41817da 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -232,11 +232,6 @@ designate_services: execstarts: "{{ designate_bin }}/designate-api" start_order: 1 -# List of unit files this role will "mask". These units, when found, are knonw -# to conflict with running services for this given role. Any unit listed will be -# stopped and masked. -designate_mask_conflicting_units: "{{ _designate_mask_conflicting_units | default([]) }}" - # This variable is used by the repo_build process to determine # which host group to check for members of before building the # pip packages required by this role. The value is picked up diff --git a/tasks/designate_post_install.yml b/tasks/designate_post_install.yml index d94e13d..cff0544 100644 --- a/tasks/designate_post_install.yml +++ b/tasks/designate_post_install.yml @@ -90,12 +90,3 @@ with_fileglob: - rootwrap.d/* notify: Restart designate services - -- name: Mask any conflicting units - systemd: - name: "{{ item }}" - state: stopped - enabled: false - masked: true - failed_when: false - with_items: "{{ designate_mask_conflicting_units }}" diff --git a/vars/debian.yml b/vars/debian.yml index 32b3b01..8fb2ffa 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -20,15 +20,7 @@ cache_timeout: 600 designate_distro_packages: [] designate_service_distro_packages: - - designate - - designate-agent - - designate-api - - designate-central - - designate-pool-manager - - designate-producer - - designate-sink - - designate-worker - - designate-zone-manager + - python3-designate - python-systemd - python3-systemd @@ -37,8 +29,3 @@ designate_rndc_packages: designate_devel_distro_packages: - libsystemd-dev - -_designate_mask_conflicting_units: - - designate-agent.service - - designate-zone-manager.service - - designate-pool-manager.service