Update stor4nfv install scripts according to opensds aruba release

[stor4nfv.git] / ci / ansible / roles / osdsdb / scenarios / etcd.yml

diff --git a/ci/ansible/roles/osdsdb/scenarios/etcd.yml b/ci/ansible/roles/osdsdb/scenarios/etcd.yml
old mode 100755 (executable)
new mode 100644 (file)
index b05f0e7..acd4937
--- a/ci/ansible/roles/osdsdb/scenarios/etcd.yml
+++ b/ci/ansible/roles/osdsdb/scenarios/etcd.yml
@@ -1,39 +1,53 @@
----
-- name: check for etcd existed
-  stat:
-    path: "{{ etcd_dir }}/etcd"
-  ignore_errors: yes
-  register: etcdexisted
-
-- name: download etcd
-  get_url:
-    url={{ etcd_download_url }}
-    dest=/opt/{{ etcd_tarball }}
-  when:
-    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false
-
-- name: extract the etcd tarball
-  unarchive:
-    src=/opt/{{ etcd_tarball }}
-    dest=/opt/
-  when:
-    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false
-
-- name: Check if etcd is running
-  shell: ps aux | grep etcd | grep -v grep
-  ignore_errors: true
-  register: service_etcd_status
-
-- name: run etcd daemon service
-  shell: nohup ./etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }} -advertise-client-urls http://{{ etcd_host }}:{{ etcd_peer_port }} -listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }} &>>etcd.log &
-  become: true
-  args:
-    chdir: "{{ etcd_dir }}"
-  when: service_etcd_status.rc != 0
-
-- name: check etcd cluster health
-  shell: ./etcdctl cluster-health
-  become: true
-  ignore_errors: true
-  args:
-    chdir: "{{ etcd_dir }}"
+# 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
+- name: check for etcd existed\r
+  stat:\r
+    path: "{{ etcd_dir }}/etcd"\r
+  ignore_errors: yes\r
+  register: etcdexisted\r
+\r
+- name: download etcd\r
+  get_url:\r
+    url={{ etcd_download_url }}\r
+    dest=/opt/{{ etcd_tarball }}\r
+  when:\r
+    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false\r
+\r
+- name: extract the etcd tarball\r
+  unarchive:\r
+    src=/opt/{{ etcd_tarball }}\r
+    dest=/opt/\r
+  when:\r
+    - etcdexisted.stat.exists is undefined or etcdexisted.stat.exists == false\r
+\r
+- name: Check if etcd is running\r
+  shell: ps aux | grep etcd | grep -v grep\r
+  ignore_errors: true\r
+  register: service_etcd_status\r
+\r
+- name: run etcd daemon service\r
+  shell: nohup ./etcd --advertise-client-urls http://{{ etcd_host }}:{{ etcd_port }} --listen-client-urls http://{{ etcd_host }}:{{ etcd_port }}  --listen-peer-urls http://{{ etcd_host }}:{{ etcd_peer_port }} &>>etcd.log &\r
+  become: true\r
+  args:\r
+    chdir: "{{ etcd_dir }}"\r
+  when: service_etcd_status.rc != 0\r
+\r
+- name: check etcd cluster health\r
+  shell: ./etcdctl --endpoints http://{{ etcd_host }}:{{ etcd_port }} cluster-health\r
+  become: true\r
+  ignore_errors: true\r
+  args:\r
+    chdir: "{{ etcd_dir }}"\r