This reverts commit 3bda3b997b.
We cannot rely on openstackclient as it is today. There are OSC
parameters preventing senlin client from normal operation and we see no
easy resolution when both OSC and senlinclient has been released.
Change-Id: I6b09699afcd45d36caea3e9f6ee0d132cc57354f