Make keystone config consistent with other elements.

The keystone element had its config seperated into a
seperate element, which was inconsistent with other
openstack service elements.

This change brings it into line with nova/glance/etc.

Change-Id: I37962e22e32a90824f1c91b1fc6a61435b8b83e7

elements/keystone-config/element-deps

@@ -1 +0,0 @@
-os-config-applier

elements/keystone/element-deps

@@ -1,3 +1,3 @@
-keystone-config
+os-config-applier
 os-refresh-config
 os-svc-install

elements/keystone/install.d/70-keystone

@@ -4,6 +4,3 @@ set -eux
 os-svc-install -n keystone -u keystone -r https://github.com/openstack/keystone.git
 os-svc-daemon keystone keystone keystone-all "--config-dir /etc/keystone --log-config /etc/keystone/logging.conf"
 install -m 0755 -o keystone -g keystone -d /etc/keystone/ssl
-
-install -m 0755 -o root -g root $(dirname $0)/../post-configure \
-                                $(os-refresh-config --print-base)/post-configure.d/70-keystone

elements/openstack-db/element-deps

@@ -1,2 +1 @@
 os-svc-install
-keystone-config