Revert "Setup versionless keystone endpoint in catalog"

This reverts commit 9ce14362c76c4208c4509177c91c3cf1180c0a92.

Change-Id: I3483f18973b697ed87a69694fd72484ec705718a
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index c8d9f8d..167d4a4 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -52,9 +52,6 @@
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: workshop
     galera_server_admin_password: workshop
-    keystone_public_path: '/'
-    keystone_internal_path: '/'
-    keystone_admin_path: '/'
     keystone_version: ${_param:openstack_version}
     barbican_version: ${_param:openstack_version}
     glance_version: ${_param:openstack_version}
diff --git a/classes/system b/classes/system
index f7d7cdc..bcc346c 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit f7d7cdc04adfe542176acc9b8c9d380e16e8d6b6
+Subproject commit bcc346c18cf2fc614b5e4510b4642b442280b9e0