8 files changed, 26 insertions, 29 deletions
diff --git a/ansible/roles/rancher/defaults/main.yml b/ansible/roles/rancher/defaults/main.yml
index e4e12d23..8a37574a 100644
--- a/ansible/roles/rancher/defaults/main.yml
+++ b/ansible/roles/rancher/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-rancher_server_url: "http://{{ hostvars[groups.infrastructure.0].ansible_host }}:8080"
+rancher_server_url: "http://{{ hostvars[groups.infrastructure.0].cluster_ip }}:8080"
 rancher_remove_other_env: true
 rancher_redeploy_k8s_env: true
 rancher_cluster_health_state: healthy
diff --git a/ansible/roles/rancher/molecule/default/playbook.yml b/ansible/roles/rancher/molecule/default/playbook.yml
index e4a7151e..afdbb4af 100644
--- a/ansible/roles/rancher/molecule/default/playbook.yml
+++ b/ansible/roles/rancher/molecule/default/playbook.yml
@@ -6,11 +6,11 @@
     - role: rancher
       vars:
         mode: server
-        rancher_server_url: "http://{{ cluster_ip }}:8080"
 
 - name: Converge rancher agent
   hosts: kubernetes
   roles:
+    - prepare-common
     - role: rancher
       vars:
         mode: agent
diff --git a/ansible/roles/rancher/tasks/rancher_agent.yml b/ansible/roles/rancher/tasks/rancher_agent.yml
index 73d9a642..e54d760e 100644
--- a/ansible/roles/rancher/tasks/rancher_agent.yml
+++ b/ansible/roles/rancher/tasks/rancher_agent.yml
@@ -4,6 +4,8 @@
     name: rancher_agent
     image: "{{ server_hostvars.rancher_agent_image }}"
     command: "{{ server_hostvars.rancher_agent_reg_url }}"
+    env:
+      CATTLE_AGENT_IP: "{{ cluster_ip }}"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "/var/lib/rancher:/var/lib/rancher"
diff --git a/ansible/test/roles/prepare-docker-dind/defaults/main.yml b/ansible/test/roles/prepare-docker-dind/defaults/main.yml
index 2489014e..147a828a 100644
--- a/ansible/test/roles/prepare-docker-dind/defaults/main.yml
+++ b/ansible/test/roles/prepare-docker-dind/defaults/main.yml
@@ -1,3 +1,5 @@
 ---
 # Variable specifying if we should install docker, or only prepare for it
 start_docker: true
+#The version of docker to install
+docker_version: 18.09.5
diff --git a/ansible/test/roles/prepare-docker-dind/tasks/main.yml b/ansible/test/roles/prepare-docker-dind/tasks/main.yml
index 3e109e87..c0bf1543 100644
--- a/ansible/test/roles/prepare-docker-dind/tasks/main.yml
+++ b/ansible/test/roles/prepare-docker-dind/tasks/main.yml
@@ -20,4 +20,5 @@
   package:
     name: "docker-ce-{{ docker_version }}"
     state: present
+    allow_downgrade: true
   notify: Restart docker
diff --git a/ansible/test/roles/prepare-docker-dind/vars/main.yml b/ansible/test/roles/prepare-docker-dind/vars/main.yml
deleted file mode 100644
index 950fb921..00000000
--- a/ansible/test/roles/prepare-docker-dind/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-#The version of docker to install
-docker_version: 18.09.5
diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh
index 5f4ed0ff..1e21a23a 100755
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@ -20,7 +20,7 @@
 
 ### This script prepares Nexus repositories data blobs for ONAP
 
-## The script requires following dependencies are installed: nodejs, jq, docker, twine
+## The script requires following dependencies are installed: nodejs, jq, docker, twine, expect
 ## All required resources are expected in the upper directory created during
 ## download procedure as DATA_DIR or in the directory given as --input-directory
 ## All lists used must be in project data_lists directory or in the directory given
@@ -52,12 +52,15 @@ NEXUS_EMAIL=admin@example.org
 # Setting paths
 LOCAL_PATH="$(readlink -f $(dirname ${0}))"
 
-#Defaults
+# Defaults
 DOCKER_LOAD="false"
 DATA_DIR="$(realpath ${LOCAL_PATH}/../../resources)"
 NEXUS_DATA_DIR="${DATA_DIR}/nexus_data"
 LISTS_DIR="${LOCAL_PATH}/data_lists"
 
+# Required dependencies
+COMMANDS=(jq docker expect npm twine)
+
 usage () {
     echo "   Example usage: build_nexus_blob.sh --input-directory </path/to/downloaded/files/dir> --output-directory
            </path/to/output/dir> --resource-list-directory </path/to/dir/with/resource/list> [--load-docker-images]
@@ -76,6 +79,20 @@ load_docker_images () {
     done
 }
 
+# Verify all dependencies are available in PATH
+FAILED_COMMANDS=()
+for cmd in ${COMMANDS[*]};
+do
+    command -v $cmd >/dev/null 2>&1 || FAILED_COMMANDS+=($cmd)
+done
+if [ ${#FAILED_COMMANDS[*]} -gt 0 ];
+then
+    echo "Following commands where not found in PATH and are required:"
+    echo ${FAILED_COMMANDS[*]}
+    echo "Aborting."
+    exit 1
+fi
+
 while [ "${1}" != "" ]; do
     case ${1} in
         -i | --input-directory )           shift
diff --git a/build/data_lists/onap_docker_images.list b/build/data_lists/onap_docker_images.list
index 3bf31482..c849ac69 100644
--- a/build/data_lists/onap_docker_images.list
+++ b/build/data_lists/onap_docker_images.list
@@ -223,25 +223,3 @@ registry.hub.docker.com/library/busybox:latest
 registry.hub.docker.com/library/consul:1.4.3
 registry.hub.docker.com/library/mongo:4.0.8
 registry.hub.docker.com/oomk8s/ubuntu-init:2.0.0
-coredns/coredns:1.2.6
-gcr.io/kubernetes-helm/tiller:v2.12.3
-k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1
-rancher/calico-cni:v3.4.0
-rancher/calico-ctl:v2.0.0
-rancher/calico-node:v3.4.0
-rancher/cluster-proportional-autoscaler:1.0.0
-rancher/coreos-etcd:v3.2.24-rancher1
-rancher/coreos-flannel:v0.10.0
-rancher/coreos-flannel:v0.10.0-rancher1
-rancher/flannel-cni:v0.3.0-rancher1
-rancher/hyperkube:v1.13.5-rancher1
-rancher/k8s-dns-dnsmasq-nanny:1.15.0
-rancher/k8s-dns-kube-dns:1.15.0
-rancher/k8s-dns-sidecar:1.15.0
-rancher/metrics-server:v0.3.1
-rancher/nginx-ingress-controller-defaultbackend:1.4-rancher1
-rancher/nginx-ingress-controller:0.21.0-rancher3
-rancher/pause:3.1
-rancher/rke-tools:v0.1.27
-weaveworks/weave-kube:2.5.0
-weaveworks/weave-npc:2.5.0