Use cluster_ip for rancher server url

This commit changes rancher role to
use the cluster_ip when constructing rancher
server url.
This is a prerequisite to playbook level
rancher tests.

Change-Id: Id3eff260fe9d158aa8ab39494446ff7d6ad7ec6c
Issue-ID: OOM-1906
Signed-off-by: Michal Zegan <m.zegan@samsung.com>

diff --git a/ansible/roles/rancher/defaults/main.yml b/ansible/roles/rancher/defaults/main.yml
index e4e12d2..8a37574 100644 (file)
--- 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 e4a7151..436f2ff 100644 (file)
--- a/ansible/roles/rancher/molecule/default/playbook.yml
+++ b/ansible/roles/rancher/molecule/default/playbook.yml
@@ -6,7 +6,6 @@
     - role: rancher
       vars:
         mode: server
-        rancher_server_url: "http://{{ cluster_ip }}:8080"
 
 - name: Converge rancher agent
   hosts: kubernetes