Update stor4nfv install scripts according to opensds aruba release

[stor4nfv.git] / ci / ansible / group_vars / osdsdb.yml

diff --git a/ci/ansible/group_vars/osdsdb.yml b/ci/ansible/group_vars/osdsdb.yml
index 2ec40fe..1ad176e 100644 (file)
--- a/ci/ansible/group_vars/osdsdb.yml
+++ b/ci/ansible/group_vars/osdsdb.yml
@@ -1,31 +1,48 @@
----\r
-# Variables here are applicable to all host groups NOT roles\r
-\r
-# This sample file generated by generate_group_vars_sample.sh\r
+# Copyright (c) 2018 Huawei Technologies Co., Ltd. All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License");\r
+# you may not use this file except in compliance with the License.\r
+# You may obtain a copy of the License at\r
+#\r
+#     http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+# See the License for the specific language governing permissions and\r
+# limitations under the License.\r
 \r
+---\r
 # Dummy variable to avoid error because ansible does not recognize the\r
 # file as a good configuration file when no variable in it.\r
 dummy:\r
 \r
-# You can override default vars defined in defaults/main.yml here,\r
-# but I would advice to use host or group vars instead\r
-\r
 \r
 ###########\r
 # GENERAL #\r
 ###########\r
 \r
 db_driver: etcd\r
-db_endpoint: localhost:2379,localhost:2380\r
-#db_credential: opensds:password@127.0.0.1:3306/dbname\r
+db_endpoint: "{{ etcd_host }}:{{ etcd_port }},{{ etcd_host }}:{{ etcd_peer_port }}"\r
+\r
 \r
 ###########\r
 #  ETCD   #\r
 ###########\r
 \r
 etcd_release: v3.2.0\r
+etcd_host: 127.0.0.1\r
+etcd_port: 2379\r
+etcd_peer_port: 2380\r
 \r
-# These fields are not suggested to be modified\r
+# These fields are NOT suggested to be modified\r
 etcd_tarball: etcd-{{ etcd_release }}-linux-amd64.tar.gz\r
 etcd_download_url: https://github.com/coreos/etcd/releases/download/{{ etcd_release }}/{{ etcd_tarball }}\r
-etcd_dir: /tmp/etcd-{{ etcd_release }}-linux-amd64\r
+etcd_dir: /opt/etcd-{{ etcd_release }}-linux-amd64\r
+\r
+\r
+###########\r
+# DOCKER  #\r
+###########\r
+\r
+etcd_docker_image: quay.io/coreos/etcd:latest\r