Skip to content

Commit bbe93d4

Browse files
priteauMoteHue
authored andcommitted
Install OpenSearch 2.5.0 using packages
Change-Id: I42aa30754e2d26a3953059b27b1f612ba5ae4150
1 parent eecadb1 commit bbe93d4

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

cloudkitty/storage/v2/elasticsearch/client.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,9 @@ def put_mapping(self, mapping):
158158
:rtype: requests.models.Response
159159
"""
160160
url = '/'.join(
161-
(self._url, self._index_name, '_mapping', self._mapping_name))
162-
# NOTE(peschk_l): This is done for compatibility with
163-
# Elasticsearch 6 and 7.
164-
param = {"include_type_name": "true"}
161+
(self._url, self._index_name, self._mapping_name))
165162
return self._req(
166-
self._sess.put, url, json.dumps(mapping), param, deserialize=False)
163+
self._sess.post, url, json.dumps(mapping), {}, deserialize=False)
167164

168165
def get_index(self):
169166
"""Does a GET request against ES's index API.

cloudkitty/tests/storage/v2/elasticsearch/test_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ def test_put_mapping(self):
186186
with mock.patch.object(self.client, '_req') as rmock:
187187
self.client.put_mapping(mapping)
188188
rmock.assert_called_once_with(
189-
self.client._sess.put,
190-
'http://elasticsearch:9200/index_name/_mapping/test_mapping',
191-
'{"a": "b"}', {'include_type_name': 'true'}, deserialize=False)
189+
self.client._sess.post,
190+
'http://elasticsearch:9200/index_name/test_mapping',
191+
'{"a": "b"}', {}, deserialize=False)
192192

193193
def test_get_index(self):
194194
with mock.patch.object(self.client, '_req') as rmock:

0 commit comments

Comments
 (0)