From: Milan Verespej Date: Wed, 16 Jan 2019 14:51:49 +0000 (+0100) Subject: Add variable for version of rancher server X-Git-Tag: 6.0.0-ONAP~339^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6d02f39fcfcf55566fbd321321fb1cce6e54ded4;p=oom%2Foffline-installer.git 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 --- 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