16 files changed, 283 insertions, 8 deletions
diff --git a/ansible/roles/application/molecule/ubuntu/molecule.yml b/ansible/roles/application/molecule/ubuntu/molecule.yml
new file mode 100644
index 00000000..2fde35a2
--- /dev/null
+++ b/ansible/roles/application/molecule/ubuntu/molecule.yml
@@ -0,0 +1,64 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: instance
+    image: ubuntu:18.04
+    dockerfile: ../default/Dockerfile.j2
+provisioner:
+  name: ansible
+  env:
+    ANSIBLE_ROLES_PATH: ../../../../test/roles
+  inventory:
+    group_vars:
+      all:
+        app_name: moleculetestapp
+        app_data_path: "/opt/{{ app_name }}"
+        app_helm_release_name: "{{ app_name }}"
+        app_kubernetes_namespace: "{{ app_name }}"
+        app_helm_charts_install_directory: application/helm_charts
+        app_helm_plugins_directory: "{{ app_helm_charts_install_directory}}/helm/plugins/"
+        app_helm_charts_infra_directory: "{{ app_data_path }}/helm_charts"
+        helm_bin_dir: /usr/local/bin
+        app_helm_build_targets:
+          - all
+          - onap
+        app_helm_chart_name: "{{ app_name }}"
+  lint:
+    name: ansible-lint
+  playbooks:
+    prepare: ../default/prepare.yml
+    converge: ../default/playbook.yml
+    cleanup: ../default/cleanup.yml
+scenario:
+  name: ubuntu
+  test_sequence:
+    - lint
+    - cleanup
+    - destroy
+    - dependency
+    - syntax
+    - create
+    - prepare
+    - converge
+    # - idempotence
+    # --> Action: 'idempotence'
+    # ERROR: Idempotence test failed because of the following tasks:
+    # * [instance] => application : Get helm dir
+    # * [instance] => application : Helm init and upgrade
+    # * [instance] => application : Helm Serve
+    # * [instance] => application : Helm Add Repo
+    # * [instance] => application : Helm Install application moleculetestapp
+    - side_effect
+    - verify
+    - cleanup
+    - destroy
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
+  directory: ../default/tests/
diff --git a/ansible/roles/application/tasks/install.yml b/ansible/roles/application/tasks/install.yml
index bee01e17..5cffdd07 100644
--- a/ansible/roles/application/tasks/install.yml
+++ b/ansible/roles/application/tasks/install.yml
@@ -49,6 +49,8 @@
 - name: Build local helm repository
   make:
     chdir: "{{ app_helm_charts_infra_directory }}"
+    params:
+      SKIP_LINT: "TRUE"
     target: "{{ item }}"
   loop: "{{ app_helm_build_targets }}"
   environment:
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
diff --git a/ansible/roles/nexus/molecule/default/molecule.yml b/ansible/roles/nexus/molecule/default/molecule.yml
index 63c47724..e38640d4 100644
--- a/ansible/roles/nexus/molecule/default/molecule.yml
+++ b/ansible/roles/nexus/molecule/default/molecule.yml
@@ -24,6 +24,8 @@ provisioner:
       group_vars: ../../../../group_vars
   lint:
     name: ansible-lint
+scenario:
+  name: default
 verifier:
   name: testinfra
   lint:
diff --git a/ansible/roles/nexus/molecule/ubuntu/molecule.yml b/ansible/roles/nexus/molecule/ubuntu/molecule.yml
new file mode 100644
index 00000000..9955e7d5
--- /dev/null
+++ b/ansible/roles/nexus/molecule/ubuntu/molecule.yml
@@ -0,0 +1,36 @@
+---
+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
+    volumes:
+      - /var/lib/docker
+    groups:
+      - infrastructure
+provisioner:
+  name: ansible
+  env:
+    ANSIBLE_ROLES_PATH: ../../../../test/roles
+  inventory:
+    links:
+      group_vars: ../../../../group_vars
+  lint:
+    name: ansible-lint
+  playbooks:
+    prepare: ../default/prepare.yml
+    converge: ../default/playbook.yml
+    cleanup: ../default/cleanup.yml
+scenario:
+  name: ubuntu
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/ansible/roles/nfs/defaults/main.yml b/ansible/roles/nfs/defaults/main.yml
index bce98da6..adeaf919 100644
--- a/ansible/roles/nfs/defaults/main.yml
+++ b/ansible/roles/nfs/defaults/main.yml
@@ -2,7 +2,18 @@
 nfs_packages:
   RedHat:
     - nfs-utils
+  Debian:
+    - nfs-common
+    - nfs-kernel-server
 nfs_services:
   RedHat:
     - rpcbind
     - nfs-server
+  Debian:
+    - rpcbind
+    - nfs-kernel-server
+nfs_destination:
+  RedHat:
+    - "/etc/exports.d/dockerdata-nfs.exports"
+  Debian:
+    - "/etc/exports"
diff --git a/ansible/roles/nfs/molecule/default/molecule.yml b/ansible/roles/nfs/molecule/default/molecule.yml
index a8ca6a30..9af32360 100644
--- a/ansible/roles/nfs/molecule/default/molecule.yml
+++ b/ansible/roles/nfs/molecule/default/molecule.yml
@@ -43,6 +43,8 @@ provisioner:
       host_vars: host_vars
   lint:
     name: ansible-lint
+scenario:
+  name: default
 verifier:
   name: testinfra
   lint:
diff --git a/ansible/roles/nfs/molecule/default/tests/test_default.py b/ansible/roles/nfs/molecule/default/tests/test_default.py
index 48139898..dc808753 100644
--- a/ansible/roles/nfs/molecule/default/tests/test_default.py
+++ b/ansible/roles/nfs/molecule/default/tests/test_default.py
@@ -7,10 +7,13 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
-@pytest.mark.parametrize('pkg', [
-  'nfs-utils'
+@pytest.mark.parametrize('distro,pkg', [
+  ('centos', 'nfs-utils'),
+  ('ubuntu', 'nfs-common'),
+  ('ubuntu', 'nfs-kernel-server')
 ])
-def test_pkg(host, pkg):
-    package = host.package(pkg)
-
-    assert package.is_installed
+def test_pkg(host, distro, pkg):
+    os = host.system_info.distribution
+    if distro == os:
+        package = host.package(pkg)
+        assert package.is_installed
diff --git a/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py b/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py
index 88ba0a61..e35e21c3 100644
--- a/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py
+++ b/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py
@@ -20,9 +20,14 @@ def test_svc(host, svc):
 
 
 def test_exports(host):
+    os = host.system_info.distribution
+    if (os == "centos"):
+        host_file = "/etc/exports.d/dockerdata-nfs.exports"
+    elif (os == "ubuntu"):
+        host_file = "/etc/exports"
     node2_ip = testinfra.get_host("docker://kubernetes-node-2").interface(
         "eth0").addresses[0]
-    f = host.file("/etc/exports.d/dockerdata-nfs.exports")
+    f = host.file(host_file)
     assert f.exists
     assert f.content_string == \
         """/dockerdata-nfs  """ + node2_ip + """(rw,sync,no_root_squash,no_subtree_check)"""  # noqa: E501
diff --git a/ansible/roles/nfs/molecule/ubuntu/molecule.yml b/ansible/roles/nfs/molecule/ubuntu/molecule.yml
new file mode 100644
index 00000000..3fe393fc
--- /dev/null
+++ b/ansible/roles/nfs/molecule/ubuntu/molecule.yml
@@ -0,0 +1,54 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: kubernetes-node-1
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04}
+    pre_build_image: true
+    privileged: true
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    groups:
+      - kubernetes
+      - nfs-server
+    purge_networks: true
+    networks:
+      - name: nfs-net
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /dockerdata-nfs
+  - name: kubernetes-node-2
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04}
+    pre_build_image: true
+    privileged: true
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    groups:
+      - kubernetes
+    purge_networks: true
+    networks:
+      - name: nfs-net
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+provisioner:
+  name: ansible
+  env:
+    ANSIBLE_ROLES_PATH: "../../../../test/roles"
+  inventory:
+    links:
+      group_vars: ../../../../group_vars
+      host_vars: ../default/host_vars
+  lint:
+    name: ansible-lint
+  playbooks:
+    prepare: ../default/prepare.yml
+    converge: ../default/playbook.yml
+scenario:
+  name: ubuntu
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
+  directory: ../default/tests
diff --git a/ansible/roles/nfs/tasks/main.yml b/ansible/roles/nfs/tasks/main.yml
index 1d848876..cc5290db 100644
--- a/ansible/roles/nfs/tasks/main.yml
+++ b/ansible/roles/nfs/tasks/main.yml
@@ -23,7 +23,8 @@
     - name: Add hosts to exports
       template:
         src: exports.j2
-        dest: /etc/exports.d/dockerdata-nfs.exports
+        dest: "{{ item }}"
+      loop: "{{ nfs_destination[ansible_os_family] }}"
       notify:
         - reload nfs
   when:
diff --git a/ansible/roles/package-repository/handlers/main.yml b/ansible/roles/package-repository/handlers/main.yml
new file mode 100644
index 00000000..304cc873
--- /dev/null
+++ b/ansible/roles/package-repository/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+- name: Restart NetworkManager
+  systemd:
+    name: NetworkManager
+    state: restarted
+  when: ansible_connection != 'docker'
diff --git a/ansible/roles/package-repository/tasks/main.yml b/ansible/roles/package-repository/tasks/main.yml
index 7dc2e76f..e2a5fd46 100644
--- a/ansible/roles/package-repository/tasks/main.yml
+++ b/ansible/roles/package-repository/tasks/main.yml
@@ -1,4 +1,20 @@
 ---
+- name: Disable DNS management in Network Manager
+  ini_file:
+    path: /etc/NetworkManager/NetworkManager.conf
+    state: present
+    no_extra_spaces: true
+    section: main
+    option: dns
+    value: none
+    owner: root
+    group: root
+    mode: 0644
+    backup: false
+  when: ansible_os_family == 'RedHat'
+  notify:
+    - Restart NetworkManager
+
 - name: Setup resolv.conf for node to find package repository by name from infra
   lineinfile:
     line: "nameserver {{ hostvars[groups.infrastructure[0]].cluster_ip }}"
diff --git a/ansible/roles/setup/molecule/ubuntu/molecule.yml b/ansible/roles/setup/molecule/ubuntu/molecule.yml
new file mode 100644
index 00000000..16dcedf7
--- /dev/null
+++ b/ansible/roles/setup/molecule/ubuntu/molecule.yml
@@ -0,0 +1,24 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: instance
+    image: ${PLATFORM_DISTRO:-ubuntu}:${DISTRO_VERSION:-18.04}
+    dockerfile: ../default/Dockerfile.j2
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ../default/playbook.yml
+scenario:
+  name: ubuntu
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
+  directory: ../default/tests/