From b9f16e2669ff5a0cde006951ffec5dff84ac29df Mon Sep 17 00:00:00 2001 From: leonwang Date: Fri, 23 Feb 2018 15:01:06 +0000 Subject: Update opensds ansible This patch is designed for solving some problems below: - Sync the latest code with opensds community - Enable containerized deployment in ansible script - Fix some bugs in port conflicts of etcd deployment Change-Id: Id48906b91c08b3a98e6fc3d8d424a1cd2b11f2be Signed-off-by: leonwang --- ci/ansible/group_vars/osdsdb.yml | 64 +++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 31 deletions(-) mode change 100644 => 100755 ci/ansible/group_vars/osdsdb.yml (limited to 'ci/ansible/group_vars/osdsdb.yml') diff --git a/ci/ansible/group_vars/osdsdb.yml b/ci/ansible/group_vars/osdsdb.yml old mode 100644 new mode 100755 index f5dfdef..c8ef864 --- a/ci/ansible/group_vars/osdsdb.yml +++ b/ci/ansible/group_vars/osdsdb.yml @@ -1,31 +1,33 @@ ---- -# Variables here are applicable to all host groups NOT roles - -# This sample file generated by generate_group_vars_sample.sh - -# Dummy variable to avoid error because ansible does not recognize the -# file as a good configuration file when no variable in it. -dummy: - -# You can override default vars defined in defaults/main.yml here, -# but I would advice to use host or group vars instead - - -########### -# GENERAL # -########### - -db_driver: etcd -db_endpoint: localhost:2379,localhost:2380 -#db_credential: opensds:password@127.0.0.1:3306/dbname - -########### -# ETCD # -########### - -etcd_release: v3.2.0 - -# These fields are not suggested to be modified -etcd_tarball: etcd-{{ etcd_release }}-linux-amd64.tar.gz -etcd_download_url: https://github.com/coreos/etcd/releases/download/{{ etcd_release }}/{{ etcd_tarball }} -etcd_dir: /opt/etcd-{{ etcd_release }}-linux-amd64 +--- +# Dummy variable to avoid error because ansible does not recognize the +# file as a good configuration file when no variable in it. +dummy: + + +########### +# GENERAL # +########### + +db_driver: etcd +db_endpoint: localhost:2379,localhost:2380 +#db_credential: opensds:password@127.0.0.1:3306/dbname + +########### +# ETCD # +########### + +etcd_release: v3.2.0 +etcd_host: 127.0.0.1 +etcd_port: 2379 +etcd_peer_port: 2380 + +# These fields are not suggested to be modified +etcd_tarball: etcd-{{ etcd_release }}-linux-amd64.tar.gz +etcd_download_url: https://github.com/coreos/etcd/releases/download/{{ etcd_release }}/{{ etcd_tarball }} +etcd_dir: /opt/etcd-{{ etcd_release }}-linux-amd64 + +########### +# DOCKER # +########### + +etcd_docker_image: quay.io/coreos/etcd:latest -- cgit 1.2.3-korg