Improve 'nexus' role testability

A change needed by related commit to allow building
a custom nexus url.

Change-Id: Iaa7e1d10d9621871e71863c77722cd635b7e1e4d
Issue-ID: OOM-1915
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/ansible/roles/nexus/defaults/main.yml b/ansible/roles/nexus/defaults/main.yml
index 8f63697..194f88b 100644 (file)
--- a/ansible/roles/nexus/defaults/main.yml
+++ b/ansible/roles/nexus/defaults/main.yml
@@ -6,4 +6,6 @@ populate_nexus: false
 # but all images are pre-populated either at buildtime or at install time (populate_nexus).
 runtime_images: {}
 # Default rule for tarball naming translation
+nexus_url: "{{ nexus_url_scheme | default('https') }}://nexus.{{ hostvars[groups.infrastructure[0]].ansible_nodename }}{{ nexus_port | default('') }}"
 nexus3_image_tar: "{{ nexus3_image | regex_replace('(\\/|\\:)', '_') }}.tar"
+nexus3_published_ports: []

diff --git a/ansible/roles/nexus/tasks/install.yml b/ansible/roles/nexus/tasks/install.yml
index c88e585..6ac2b13 100644 (file)
--- a/ansible/roles/nexus/tasks/install.yml
+++ b/ansible/roles/nexus/tasks/install.yml
@@ -24,6 +24,7 @@
     image: "{{ nexus3_image }}"
     networks:
       - name: nexus_network
+    published_ports: "{{ nexus3_published_ports }}"
     volumes:
       - "{{ app_data_path }}/nexus_data:/nexus-data:rw"
     state: started

diff --git a/ansible/roles/nexus/vars/main.yml b/ansible/roles/nexus/vars/main.yml
deleted file mode 100644 (file)
index 5ec5186..0000000
--- a/ansible/roles/nexus/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-nexus_url: "https://nexus.{{ hostvars[groups.infrastructure[0]].ansible_nodename }}"