From 4608ea751ebbe43479e60215599eae506fd3b963 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 6 Mar 2018 20:03:53 +0100 Subject: [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 --- .gitmodules | 1 - ...eter-server-publisher-Add-enabled-default.patch | 31 ++++++++++++++++++ ...0002-Use-keystone-v3-endpoints-by-default.patch | 34 ++++++++++++++++++++ ...02-mongodb-Parameterize-cluster-hostnames.patch | 37 ---------------------- ...003-Revert-Admin-endpoint-for-keystone-v3.patch | 36 +++++++++++++++++++++ ...0003-Use-keystone-v3-endpoints-by-default.patch | 34 -------------------- ...004-Revert-Admin-endpoint-for-keystone-v3.patch | 36 --------------------- mcp/reclass/classes/system | 2 +- 8 files changed, 102 insertions(+), 109 deletions(-) create mode 100644 mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch create mode 100644 mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch delete mode 100644 mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch create mode 100644 mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch delete mode 100644 mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch delete mode 100644 mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch diff --git a/.gitmodules b/.gitmodules index 565943da6..c7c44587c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,6 @@ path = mcp/reclass/classes/system url = https://github.com/Mirantis/reclass-system-salt-model branch = master - ignore = all [submodule "scripts"] path = mcp/deploy/scripts url = https://github.com/salt-formulas/salt-formulas-scripts diff --git a/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch b/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch new file mode 100644 index 000000000..ab818df70 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch @@ -0,0 +1,31 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 +Date: Tue, 6 Mar 2018 22:40:06 +0100 +Subject: [PATCH] ceilometer:server:publisher: Add 'enabled' default + +Fixes: #306 + +Signed-off-by: Alexandru Avadanii +--- + ceilometer/server/cluster.yml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml +index 11488fb..2d19e31 100644 +--- a/ceilometer/server/cluster.yml ++++ b/ceilometer/server/cluster.yml +@@ -14,6 +14,7 @@ parameters: + ttl: 86400 + publisher: + default: ++ enabled: false + bind: + host: ${_param:cluster_local_address} + port: 8777 diff --git a/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch new file mode 100644 index 000000000..b22951a8f --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch @@ -0,0 +1,34 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Michael Polenchuk +Date: Thu, 28 Dec 2017 12:49:33 +0400 +Subject: [PATCH] Use keystone v3 endpoints by default + +The v2.0 auth API has been already marked as deprecated in the +Mitaka release and will be removed in the "T" release. +The v3 API should be used instead. + +Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 +--- + keystone/client/single.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keystone/client/single.yml b/keystone/client/single.yml +index a79ed7e..86b4e09 100644 +--- a/keystone/client/single.yml ++++ b/keystone/client/single.yml +@@ -4,7 +4,7 @@ classes: + - system.keystone.client.service.glance + - system.keystone.client.service.heat + - system.keystone.client.service.heat-cfn +-- system.keystone.client.service.keystone ++- system.keystone.client.service.keystone3 + - system.keystone.client.service.neutron + parameters: + _param: diff --git a/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch b/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch deleted file mode 100644 index e77496001..000000000 --- a/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch +++ /dev/null @@ -1,37 +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 -Date: Sun, 10 Dec 2017 21:58:52 +0100 -Subject: [PATCH] mongodb: Parameterize cluster hostnames - -Replace mdb{01,02,03} with reclass params, similar to prev commit. - -Signed-off-by: Alexandru Avadanii ---- - mongodb/server/cluster.yml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mongodb/server/cluster.yml b/mongodb/server/cluster.yml -index f3c16d6..1d1e397 100644 ---- a/mongodb/server/cluster.yml -+++ b/mongodb/server/cluster.yml -@@ -3,9 +3,9 @@ classes: - parameters: - _param: - mongodb_server_replica_set: mongodb -- mongodb_master: mdb01 -+ mongodb_master: ${_param:openstack_telemetry_node01_hostname} - mongodb_server_members: -- - host: mdb01 -+ - host: ${_param:openstack_telemetry_node01_hostname} - priority: 2 -- - host: mdb02 -- - host: mdb03 -+ - host: ${_param:openstack_telemetry_node02_hostname} -+ - host: ${_param:openstack_telemetry_node03_hostname} diff --git a/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch new file mode 100644 index 000000000..d0ddc58c2 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch @@ -0,0 +1,36 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 +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 +--- + 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} diff --git a/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch deleted file mode 100644 index b22951a8f..000000000 --- a/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch +++ /dev/null @@ -1,34 +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: Michael Polenchuk -Date: Thu, 28 Dec 2017 12:49:33 +0400 -Subject: [PATCH] Use keystone v3 endpoints by default - -The v2.0 auth API has been already marked as deprecated in the -Mitaka release and will be removed in the "T" release. -The v3 API should be used instead. - -Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 ---- - keystone/client/single.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keystone/client/single.yml b/keystone/client/single.yml -index a79ed7e..86b4e09 100644 ---- a/keystone/client/single.yml -+++ b/keystone/client/single.yml -@@ -4,7 +4,7 @@ classes: - - system.keystone.client.service.glance - - system.keystone.client.service.heat - - system.keystone.client.service.heat-cfn --- system.keystone.client.service.keystone -+- system.keystone.client.service.keystone3 - - system.keystone.client.service.neutron - parameters: - _param: 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 -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 ---- - 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} diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index a798f6aec..20afa5cea 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit a798f6aecd54642865b19752a7f22d2ad3a36ace +Subproject commit 20afa5cea210bf6b991dc6ed394d3378bf98c130 -- cgit 1.2.3-korg