89560dd65f
InfluxDB config file merging isn't supported in Kolla-Ansible because it uses 'nested sections' which aren't supported by merge_configs. If no override file is specified, Kayobe will write out an empty config file which will then be used as the InfluxDB config file, breaking InfluxDB. To prevent that happening this change removes the extra config in Kayobe. It also fixes the directory to which the 'glob' collected config is copied to, as Kolla-Ansible doesn't look for Influxdb config files in the influxdb folder. Change-Id: Iee4b7987934045f0355b4a87cebaebc1aa2bbe77 Story: 2003951 Task: 26868
63 lines
1.5 KiB
Python
63 lines
1.5 KiB
Python
# Copyright (c) 2018 StackHPC Ltd.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
import os.path
|
|
|
|
from kayobe.tests.molecule import utils
|
|
|
|
import pytest
|
|
import testinfra.utils.ansible_runner
|
|
|
|
|
|
testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
|
|
os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
'path',
|
|
['fluentd/filter',
|
|
'fluentd/output',
|
|
'keystone'])
|
|
def test_service_config_directory(host, path):
|
|
path = os.path.join('/etc/kolla/config', path)
|
|
utils.test_directory(host, path)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
'path',
|
|
['ceph',
|
|
'cinder',
|
|
'designate',
|
|
'glance',
|
|
'grafana',
|
|
'heat',
|
|
'horizon',
|
|
'ironic',
|
|
'kafka',
|
|
'magnum',
|
|
'manila',
|
|
'mariadb',
|
|
'monasca',
|
|
'murano',
|
|
'neutron',
|
|
'nova',
|
|
'sahara',
|
|
'storm',
|
|
'swift',
|
|
'zookeeper'])
|
|
def test_service_config_directory_absent(host, path):
|
|
path = os.path.join('/etc/kolla/config', path)
|
|
utils.test_path_absent(host, path)
|