Description of problem:
In the etcd world, data-dir is used to represent the parent directory of member data. Its value is typically /var/lib/etcd where member directory resides.

The discover-etcd-initial-cluster tool currently expects data-dir to be /var/lib/etcd/member. Changing this to be consistent with other usages is warranted.

Version-Release number of selected component (if applicable):


How reproducible:
Always

Steps to Reproduce:
1.
2.
3.

Actual results:
discover-etcd-initial-cluster as used in etcd-pod.yaml requires --data-dir option to be /var/lib/etcd/member.

Expected results:
discover-etcd-initial-cluster should use --data-dir as /var/lib/etcd to be consistent with other usages of the phrase `data-dir`.

Additional info: