From 37548ba704097cd84c93597f259d76ec09f91279 Mon Sep 17 00:00:00 2001 From: venkata anil Date: Fri, 31 Aug 2018 16:57:48 +0530 Subject: [PATCH] set right config path for containers Containers use configuration files from the path /var/lib/config-data/puppet-generated// Change-Id: I1e5c4935b72fcabd5256d0bf8014cae3beb314a4 --- ansible/gather/roles/common/files/openstack-config-parser.py | 4 ++-- ansible/gather/roles/common/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/gather/roles/common/files/openstack-config-parser.py b/ansible/gather/roles/common/files/openstack-config-parser.py index 6249fa7d0..343bb355b 100644 --- a/ansible/gather/roles/common/files/openstack-config-parser.py +++ b/ansible/gather/roles/common/files/openstack-config-parser.py @@ -125,8 +125,8 @@ def main(): if 'undercloud' in service_name: cfg_path = "/home/stack" elif in_container and service_name not in pattern_exceptions: - cfg_path = "/var/lib/config-data/{}/etc/{}".format(service_name, - service_name) + cfg_path = "/var/lib/config-data/puppet-generated/{}/etc/{}".format( + service_name, service_name) # Glance has all configs in a folder named glance_api, ps shows no # processes outside of the container, so I assume those are the right # configs, even though the container is also named glance-api diff --git a/ansible/gather/roles/common/tasks/main.yml b/ansible/gather/roles/common/tasks/main.yml index 022ebe29c..1656b7779 100644 --- a/ansible/gather/roles/common/tasks/main.yml +++ b/ansible/gather/roles/common/tasks/main.yml @@ -12,7 +12,7 @@ - name: Set var for container deployment set_fact: containers: True - config_path: /var/lib/config-data/ + config_path: /var/lib/config-data/puppet-generated/ when: docker_ps.stdout|int > 1 - name: Set fact for non-container deployment