summaryrefslogtreecommitdiffstats
path: root/ansible/roles/vncserver
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-04-05 13:03:08 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-05 13:03:08 +0000
commitd76d4e5948969fe0266645df7e06f973fdb9b44b (patch)
tree045ec3c09b37316ef44b2e3ddea29b960c15b0f3 /ansible/roles/vncserver
parent1bfd41937210685fb9a9ac318d124f16acdbe274 (diff)
parenta0ad5c1091c43b96b7b54b4a2c4eca02d5f9a4eb (diff)
Merge "Adding versions for infra related docker images"
Diffstat (limited to 'ansible/roles/vncserver')
-rw-r--r--ansible/roles/vncserver/defaults/main.yml3
-rw-r--r--ansible/roles/vncserver/tasks/main.yml10
2 files changed, 8 insertions, 5 deletions
diff --git a/ansible/roles/vncserver/defaults/main.yml b/ansible/roles/vncserver/defaults/main.yml
new file mode 100644
index 00000000..e74ccb7c
--- /dev/null
+++ b/ansible/roles/vncserver/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+# Default rule for tarball naming translation
+vnc_server_image_tar: "{{ vnc_server_image | regex_replace('(\\/|\\:)', '_') }}.tar"
diff --git a/ansible/roles/vncserver/tasks/main.yml b/ansible/roles/vncserver/tasks/main.yml
index 56ae707b..b1aaed9e 100644
--- a/ansible/roles/vncserver/tasks/main.yml
+++ b/ansible/roles/vncserver/tasks/main.yml
@@ -1,15 +1,15 @@
---
- name: Load VNC server image
docker_image:
- name: consol/centos-icewm-vnc:latest
- load_path: '{{ app_data_path }}/offline_data/docker_images_infra/consol_centos_icewm_vnc_latest.tar'
+ name: "{{ vnc_server_image }}"
+ load_path: "{{ infra_images_path }}/{{ vnc_server_image_tar }}"
state: present
timeout: 120
-- name: Run VNC server
+- name: Start VNC server container
docker_container:
- name: vnc_server
- image: consol/centos-icewm-vnc
+ name: vnc-server
+ image: "{{ vnc_server_image }}"
state: started
restart_policy: unless-stopped
ports: