summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-10 12:38:19 -0500
committerGitHub <noreply@github.com>2017-05-10 12:38:19 -0500
commit6e1f175f4539ca9b2c0c0f059da507bd8f04ccb3 (patch)
tree296861870c2c3236e32e986cd85fe6146854c72c
parentc8e8f8f7b506de67c0beb92534b303451938aeba (diff)
parentf696358767f1d8af996d7ad218dea3770c3fa0c6 (diff)
downloadopenshift-6e1f175f4539ca9b2c0c0f059da507bd8f04ccb3.tar.gz
openshift-6e1f175f4539ca9b2c0c0f059da507bd8f04ccb3.tar.bz2
openshift-6e1f175f4539ca9b2c0c0f059da507bd8f04ccb3.tar.xz
openshift-6e1f175f4539ca9b2c0c0f059da507bd8f04ccb3.zip
Merge pull request #4124 from ingvagabund/update-etcd-common-readme
Merged by openshift-bot
l---------playbooks/common/openshift-cluster/upgrades/etcd/files/etcdctl.sh1
-rw-r--r--roles/etcd_common/README.md37
2 files changed, 28 insertions, 10 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/files/etcdctl.sh b/playbooks/common/openshift-cluster/upgrades/etcd/files/etcdctl.sh
deleted file mode 120000
index 641e04e44..000000000
--- a/playbooks/common/openshift-cluster/upgrades/etcd/files/etcdctl.sh
+++ /dev/null
@@ -1 +0,0 @@
-../roles/etcd/files/etcdctl.sh \ No newline at end of file
diff --git a/roles/etcd_common/README.md b/roles/etcd_common/README.md
index 131a01490..d1c3a6602 100644
--- a/roles/etcd_common/README.md
+++ b/roles/etcd_common/README.md
@@ -1,17 +1,21 @@
etcd_common
========================
-TODO
+Common resources for dependent etcd roles. E.g. default variables for:
+* config directories
+* certificates
+* ports
+* other settings
-Requirements
-------------
-
-TODO
+Or `delegated_serial_command` ansible module for executing a command on a remote node. E.g.
-Role Variables
---------------
+```yaml
+- delegated_serial_command:
+ command: /usr/bin/make_database.sh arg1 arg2
+ creates: /path/to/database
+```
-TODO
+Or etcdctl.yml playbook for installation of `etcdctl` aliases on a node (see example).
Dependencies
------------
@@ -21,7 +25,22 @@ openshift-repos
Example Playbook
----------------
-TODO
+**Drop etcdctl aliases**
+
+```yaml
+- include_role:
+ name: etcd_common
+ tasks_from: etcdctl
+```
+
+**Get access to common variables**
+
+```yaml
+# meta.yml of etcd
+...
+dependencies:
+- { role: etcd_common }
+```
License
-------