summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-01-21 13:47:44 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-21 13:47:44 +0000
commit57fd33e0447dea616a0ab1264583d87e1f491f41 (patch)
treee4517d165eb7b89f380b149f4a23528bcfb5b3ba
parentf3bcb1e1a4a8a7f0c99ef4b6bffdae66ec6cfc1e (diff)
parent6d02f39fcfcf55566fbd321321fb1cce6e54ded4 (diff)
Merge "Add variable for version of rancher server"
-rwxr-xr-xansible/group_vars/infrastructure.yml1
-rw-r--r--ansible/roles/rancher/tasks/rancher_server.yml4
2 files changed, 3 insertions, 2 deletions
diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml
index cd682e2a..9fd88f25 100755
--- a/ansible/group_vars/infrastructure.yml
+++ b/ansible/group_vars/infrastructure.yml
@@ -25,6 +25,7 @@ simulated_hosts:
all_simulated_hosts:
"{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}"
rancher_server_url: "http://{{ hostvars[groups.infrastructure.0].ansible_host }}:8080"
+rancher_server_version: v1.6.22
rancher_remove_other_env: yes
rancher_redeploy_k8s_env: yes
populate_nexus: no
diff --git a/ansible/roles/rancher/tasks/rancher_server.yml b/ansible/roles/rancher/tasks/rancher_server.yml
index 9abf986b..64b35e4c 100644
--- a/ansible/roles/rancher/tasks/rancher_server.yml
+++ b/ansible/roles/rancher/tasks/rancher_server.yml
@@ -1,9 +1,9 @@
---
# DO NOT ADD SPACE AROUND ';'
-- name: Start rancher/server:v1.6.14
+- name: Start rancher/server:{{ rancher_server_version }}
docker_container:
name: rancher_server
- image: rancher/server:v1.6.14
+ image: rancher/server:{{ rancher_server_version }}
command: ["sh", "-c", "/usr/sbin/update-ca-certificates;/usr/bin/entry /usr/bin/s6-svscan /service"]
ports: 8080:8080
state: started