From 91a84330494b100ac9077652c910fb248f737717 Mon Sep 17 00:00:00 2001 From: leonwang Date: Tue, 7 Aug 2018 14:49:27 +0800 Subject: Update the latest version of ansible script This patch is proposed for merging the latest version of ansible code according to opensds-installer project. From the latest version code, we change the default installation way from source code to release, which means there is no need for golang environment prepare and long-time building work. Change-Id: I93d7d24f29e61979bc8fda7125ae753063eda423 Signed-off-by: leonwang --- ci/ansible/roles/osdsdock/tasks/main.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'ci/ansible/roles/osdsdock/tasks/main.yml') diff --git a/ci/ansible/roles/osdsdock/tasks/main.yml b/ci/ansible/roles/osdsdock/tasks/main.yml index 8b18c8d..dc803b5 100644 --- a/ci/ansible/roles/osdsdock/tasks/main.yml +++ b/ci/ansible/roles/osdsdock/tasks/main.yml @@ -43,16 +43,20 @@ done args: chdir: "{{ opensds_work_dir }}" - when: container_enabled == false + when: install_from != "container" - name: run osdsdock containerized service docker_container: name: osdsdock - image: opensdsio/opensds-dock:latest + image: "{{ dock_docker_image }}" state: started network_mode: host privileged: true volumes: - - "/etc/opensds/:/etc/opensds" - - "/etc/ceph/:/etc/ceph" - when: container_enabled == true + - "/etc/opensds:/etc/opensds" + - "/etc/ceph:/etc/ceph" + - "/dev/:/dev/" + - "/run/:/run/:shared" + - "/etc/localtime:/etc/localtime:ro" + - "/lib/modules:/lib/modules:ro" + when: install_from == "container" -- cgit 1.2.3-korg