[patch] Fixup ceilometer server publisher default

- backport proposed fixup for ceilometer;
- remove 'ignore: all' from .gitmodules to make it easier to bump the
  submodule;
- bump system submodule to upstream latest;
- drop patch merged upstream;

JIRA: FUEL-350

Change-Id: I68f232e0da5af368a1669a7379eedde5c4168b84
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 0 insertions, 36 deletions

diff --git a/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch
deleted file mode 100644
index d0ddc58c2..000000000
--- a/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 2 Jan 2018 05:40:20 +0100
-Subject: [PATCH] Revert "Admin endpoint for keystone v3"
-
-Now that v2 API is obsolete, the 'admin' endpoint is unavailable,
-forcing clients to try the next endpoint (i.e. 'public'), which
-usually works, but implies external routing between mgmt and public
-is in place.
-For isolated networks, no valid endpoint is found.
-
-This reverts commit a045e8ef192b5a729e25c616cade70c2b0ad0761.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- keystone/client/service/keystone3.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml
-index 5138c4f..9b69294 100644
---- a/keystone/client/service/keystone3.yml
-+++ b/keystone/client/service/keystone3.yml
-@@ -22,5 +22,5 @@ parameters:
-                 internal_protocol: ${_param:keystone_service_protocol}
-                 admin_address: ${_param:keystone_service_host}
-                 admin_port: 35357
--                admin_path: '/v2.0'
-+                admin_path: '/v3'
-                 admin_protocol: ${_param:keystone_service_protocol}