Remove references to unsupported operating systems
All references to Gentoo, SUSE, Debian stretch and Centos-7 are removed. Conditional tasks, ternary operators and variables are simplified where possible OS specific variables files are generalised where possible Change-Id: I96a9757621eab69e7bc16a2e31ab28d0eb8a23be
This commit is contained in:
parent
6f866bdcb3
commit
e0afffd98c
@ -22,17 +22,14 @@ galaxy_info:
|
|||||||
platforms:
|
platforms:
|
||||||
- name: Debian
|
- name: Debian
|
||||||
versions:
|
versions:
|
||||||
- stretch
|
- buster
|
||||||
- name: Ubuntu
|
- name: Ubuntu
|
||||||
versions:
|
versions:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
|
- focal
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
- 7
|
- 8
|
||||||
- name: opensuse
|
|
||||||
versions:
|
|
||||||
- 15
|
|
||||||
categories:
|
categories:
|
||||||
- cloud
|
- cloud
|
||||||
- python
|
- python
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
package:
|
package:
|
||||||
name: "{{ designate_package_list }}"
|
name: "{{ designate_package_list }}"
|
||||||
state: "{{ designate_package_state }}"
|
state: "{{ designate_package_state }}"
|
||||||
update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
|
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
|
||||||
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
||||||
register: install_packages
|
register: install_packages
|
||||||
until: install_packages is success
|
until: install_packages is success
|
||||||
|
@ -4,15 +4,8 @@
|
|||||||
options {
|
options {
|
||||||
{% if ansible_pkg_mgr == 'apt' %}
|
{% if ansible_pkg_mgr == 'apt' %}
|
||||||
directory "/var/cache/bind";
|
directory "/var/cache/bind";
|
||||||
{% elif ansible_pkg_mgr in ['yum', 'dnf'] %}
|
{% elif ansible_pkg_mgr == 'dnf' %}
|
||||||
directory "/var/named";
|
directory "/var/named";
|
||||||
{% elif ansible_pkg_mgr == 'zypper' %}
|
|
||||||
directory "/var/lib/named";
|
|
||||||
managed-keys-directory "/var/lib/named/dyn/";
|
|
||||||
dump-file "/var/log/named_dump.db";
|
|
||||||
statistics-file "/var/log/named.stats";
|
|
||||||
notify no;
|
|
||||||
disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
// If there is a firewall between you and nameservers you want
|
// If there is a firewall between you and nameservers you want
|
||||||
@ -49,7 +42,7 @@ controls {
|
|||||||
};
|
};
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if ansible_pkg_mgr in ['yum', 'dnf'] %}
|
{% if ansible_pkg_mgr == 'dnf' %}
|
||||||
logging {
|
logging {
|
||||||
channel default_debug {
|
channel default_debug {
|
||||||
file "data/named.run";
|
file "data/named.run";
|
||||||
@ -64,30 +57,4 @@ zone "." IN {
|
|||||||
|
|
||||||
include "/etc/named.rfc1912.zones";
|
include "/etc/named.rfc1912.zones";
|
||||||
include "/etc/named.root.key";
|
include "/etc/named.root.key";
|
||||||
|
|
||||||
{% elif ansible_pkg_mgr == 'zypper' %}
|
|
||||||
|
|
||||||
zone "." in {
|
|
||||||
type hint;
|
|
||||||
file "root.hint";
|
|
||||||
};
|
|
||||||
|
|
||||||
zone "localhost" in {
|
|
||||||
type master;
|
|
||||||
file "localhost.zone";
|
|
||||||
};
|
|
||||||
|
|
||||||
zone "0.0.127.in-addr.arpa" in {
|
|
||||||
type master;
|
|
||||||
file "127.0.0.zone";
|
|
||||||
};
|
|
||||||
|
|
||||||
zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN {
|
|
||||||
type master;
|
|
||||||
file "127.0.0.zone";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
include "/etc/named.conf.include";
|
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
owner: 'root'
|
owner: 'root'
|
||||||
group: 'named'
|
group: 'named'
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr in ['yum', 'dnf']
|
- ansible_pkg_mgr == 'dnf'
|
||||||
|
|
||||||
- name: Restart bind9
|
- name: Restart bind9
|
||||||
service:
|
service:
|
||||||
|
@ -25,7 +25,7 @@ designate_service_distro_packages:
|
|||||||
- openstack-designate-producer
|
- openstack-designate-producer
|
||||||
- openstack-designate-sink
|
- openstack-designate-sink
|
||||||
- openstack-designate-worker
|
- openstack-designate-worker
|
||||||
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
|
- python3-systemd
|
||||||
|
|
||||||
designate_rndc_packages:
|
designate_rndc_packages:
|
||||||
- bind
|
- bind
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2018, SUSE LINUX GmbH.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
# Common yum packages
|
|
||||||
designate_distro_packages:
|
|
||||||
- which
|
|
||||||
|
|
||||||
designate_service_distro_packages:
|
|
||||||
- openstack-designate
|
|
||||||
- openstack-designate-agent
|
|
||||||
- openstack-designate-api
|
|
||||||
- openstack-designate-central
|
|
||||||
- openstack-designate-producer
|
|
||||||
- openstack-designate-sink
|
|
||||||
- openstack-designate-worker
|
|
||||||
|
|
||||||
designate_rndc_packages:
|
|
||||||
- bind-utils
|
|
||||||
|
|
||||||
designate_devel_distro_packages:
|
|
||||||
- systemd-devel
|
|
Loading…
x
Reference in New Issue
Block a user