From d1088fc28c9625944ee24eca330f12f504be4529 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 6 Jun 2019 07:05:47 -0700 Subject: 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 --- ansible/roles/nexus/defaults/main.yml | 2 ++ ansible/roles/nexus/tasks/install.yml | 1 + ansible/roles/nexus/vars/main.yml | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 ansible/roles/nexus/vars/main.yml (limited to 'ansible') diff --git a/ansible/roles/nexus/defaults/main.yml b/ansible/roles/nexus/defaults/main.yml index 8f636979..194f88bf 100644 --- 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 c88e5855..6ac2b131 100644 --- 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 index 5ec51869..00000000 --- a/ansible/roles/nexus/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -nexus_url: "https://nexus.{{ hostvars[groups.infrastructure[0]].ansible_nodename }}" -- cgit 1.2.3-korg