Fix distro installs on Ubuntu
Install the python3-designate package and rely on the OSA provided service configs instead of installing each of the individual designate service packages. The 'Mask any conflicting units' task can also be removed since the installation of unwanted services will no longer be an issue. Change-Id: I40a596803df656f5e6f75996660fe9ace685c2ed
This commit is contained in:
parent
7e5a171d2e
commit
a4de037651
|
@ -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
|
||||
|
|
|
@ -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 }}"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue