summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Verespej <m.verespej@partner.samsung.com>2019-01-16 15:51:49 +0100
committerMilan Verespej <m.verespej@partner.samsung.com>2019-01-17 14:58:09 +0100
commit6d02f39fcfcf55566fbd321321fb1cce6e54ded4 (patch)
tree5704e4a9ad81a3d4bca25e6e5d47d9a74769642f
parentcde2f33dfcd9728240d37c80383534a5b6af5caf (diff)
Add variable for version of rancher server
Rancher server version is hardcoded to 1.6.14 used in Beijing deployment. This limits flexibility to use it for future versions of ONAP deployments. This change adds possibility to choose version of rancher server via variable in group_vars/infrastructure.yml and setting its default value to version used by Casablanca release. Change-Id: I3a38a882386ce6adcba77780ee79a7cedfe98e4e Issue-ID: OOM-1584 Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com>
-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 ab314055..29e6edce 100755
--- a/ansible/group_vars/infrastructure.yml
+++ b/ansible/group_vars/infrastructure.yml
@@ -26,6 +26,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