Merge nbp installation into opensds ansible script

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

diff --git a/ci/ansible/group_vars/osdsdb.yml b/ci/ansible/group_vars/osdsdb.yml
old mode 100755 (executable)
new mode 100644 (file)
index c8ef864..1b6b812
--- a/ci/ansible/group_vars/osdsdb.yml
+++ b/ci/ansible/group_vars/osdsdb.yml
@@ -1,33 +1,35 @@
----
-# 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
+---\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
+\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
+\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
+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: /opt/etcd-{{ etcd_release }}-linux-amd64\r
+\r
+\r
+###########\r
+# DOCKER  #\r
+###########\r
+\r
+etcd_docker_image: quay.io/coreos/etcd:latest\r