summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
Diffstat (limited to 'ansible')
-rwxr-xr-xansible/group_vars/infrastructure.yml2
-rw-r--r--ansible/roles/rancher/tasks/rancher_server.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml
index d4df2dfd..8784ea39 100755
--- a/ansible/group_vars/infrastructure.yml
+++ b/ansible/group_vars/infrastructure.yml
@@ -24,9 +24,9 @@ simulated_hosts:
- registry.npmjs.org
all_simulated_hosts:
"{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}"
-rancher_server_version: v1.6.22
populate_nexus: false
helm_bin_dir: /usr/local/bin
+rancher_server_image: rancher/server:v1.6.22
vnc_server_image: consol/centos-icewm-vnc:1.4.0
nexus3_image: sonatype/nexus3:3.15.2
dns_server_image: andyshinn/dnsmasq:2.76
diff --git a/ansible/roles/rancher/tasks/rancher_server.yml b/ansible/roles/rancher/tasks/rancher_server.yml
index ebee6cc7..e1eb5a5d 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:{{ rancher_server_version }}
+- name: Start rancher server container
docker_container:
name: rancher-server
- image: rancher/server:{{ rancher_server_version }}
+ image: "{{ rancher_server_image }}"
command: ["sh", "-c", "/usr/sbin/update-ca-certificates;/usr/bin/entry /usr/bin/s6-svscan /service"]
ports: 8080:8080
state: started