summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-04-21 12:58:22 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-21 12:58:22 +0000
commit6dbe77db6d655d0d2d684d353d892d353c217db5 (patch)
tree398d9a25f0c517a7f36e4e29b656434c32bd72d2 /ansible
parentf00d15abae00005389cf956e194cf2abf2119f17 (diff)
parent2dcd29823739f8eae2f5980fd2d6f43981cf05b1 (diff)
Merge "Adding Ubuntu support in Ansible - dns role"
Diffstat (limited to 'ansible')
l---------ansible/roles/dns/molecule/ubuntu/group_vars1
-rw-r--r--ansible/roles/dns/molecule/ubuntu/molecule.yml42
-rw-r--r--ansible/roles/dns/tasks/main.yml6
3 files changed, 49 insertions, 0 deletions
diff --git a/ansible/roles/dns/molecule/ubuntu/group_vars b/ansible/roles/dns/molecule/ubuntu/group_vars
new file mode 120000
index 00000000..e04e088f
--- /dev/null
+++ b/ansible/roles/dns/molecule/ubuntu/group_vars
@@ -0,0 +1 @@
+../../../../group_vars/ \ No newline at end of file
diff --git a/ansible/roles/dns/molecule/ubuntu/molecule.yml b/ansible/roles/dns/molecule/ubuntu/molecule.yml
new file mode 100644
index 00000000..5428c04a
--- /dev/null
+++ b/ansible/roles/dns/molecule/ubuntu/molecule.yml
@@ -0,0 +1,42 @@
+---
+dependency:
+ name: galaxy
+driver:
+ name: docker
+lint:
+ name: yamllint
+platforms:
+ - name: infrastructure-server
+ image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04}
+ pre_build_image: True
+ privileged: true
+ override_command: False
+ groups:
+ - infrastructure
+ volumes:
+ - /var/lib/docker
+provisioner:
+ name: ansible
+ lint:
+ name: ansible-lint
+ env:
+ ANSIBLE_ROLES_PATH: ../../../../test/roles
+ ANSIBLE_LIBRARY: ../../../../library
+ playbooks:
+ prepare: ../default/prepare.yml
+ converge: ../default/playbook.yml
+ cleanup: ../default/cleanup.yml
+ inventory:
+ host_vars:
+ infrastructure-server:
+ cluster_ip: 127.0.0.1
+ group_vars:
+ all:
+ app_name: onap
+ app_data_path: "/opt/{{ app_name }}"
+scenario:
+ name: ubuntu
+verifier:
+ name: testinfra
+ lint:
+ name: flake8
diff --git a/ansible/roles/dns/tasks/main.yml b/ansible/roles/dns/tasks/main.yml
index 8a7f8bca..bfdd83b4 100644
--- a/ansible/roles/dns/tasks/main.yml
+++ b/ansible/roles/dns/tasks/main.yml
@@ -4,6 +4,12 @@
path: "{{ app_data_path }}/cfg"
state: directory
+- name: Stop systemd-resolved daemon - Ubuntu
+ systemd:
+ name: systemd-resolved
+ state: stopped
+ when: ansible_distribution in ["Ubuntu","Debian"]
+
- name: Create simulated hostnames file
template:
src: simulated_hosts.j2