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
index f5dfdef..1b6b812 100644 (file)
--- a/ci/ansible/group_vars/osdsdb.yml
+++ b/ci/ansible/group_vars/osdsdb.yml
@@ -1,15 +1,8 @@
 ---\r
-# Variables here are applicable to all host groups NOT roles\r
-\r
-# This sample file generated by generate_group_vars_sample.sh\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
@@ -19,13 +12,24 @@ db_driver: etcd
 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