diff --git a/heat-config-docker-compose/install.d/50-heat-config-hook-docker-compose b/heat-config-docker-compose/install.d/50-heat-config-hook-docker-compose index 69b4c8e..e382f63 100755 --- a/heat-config-docker-compose/install.d/50-heat-config-hook-docker-compose +++ b/heat-config-docker-compose/install.d/50-heat-config-hook-docker-compose @@ -12,6 +12,6 @@ elif [ -f /etc/redhat-release ]; then systemctl enable docker.service fi -pip install -U dpath docker-compose==1.4.0 +pip install -U docker-compose==1.4.0 -install -D -g root -o root -m 0755 ${SCRIPTDIR}/hook-docker-compose.py /var/lib/heat-config/hooks/docker-compose \ No newline at end of file +install -D -g root -o root -m 0755 ${SCRIPTDIR}/hook-docker-compose.py /var/lib/heat-config/hooks/docker-compose diff --git a/heat-config-docker-compose/install.d/hook-docker-compose.py b/heat-config-docker-compose/install.d/hook-docker-compose.py index 62c0113..f73332e 100755 --- a/heat-config-docker-compose/install.d/hook-docker-compose.py +++ b/heat-config-docker-compose/install.d/hook-docker-compose.py @@ -13,7 +13,6 @@ # under the License. import ast -import dpath import json import logging import os @@ -85,7 +84,8 @@ def main(argv=sys.argv): os.chdir(proj) compose_env_files = [] - for value in dpath.util.values(config, '*/env_file'): + for c in config.values(): + value = c.get('env_file', None) if isinstance(value, list): compose_env_files.extend(value) elif isinstance(value, six.string_types): diff --git a/test-requirements.txt b/test-requirements.txt index a7cc6a7..e9dbf8b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. coverage!=4.4,>=4.0 # Apache-2.0 -dpath>=1.3.2 fixtures>=3.0.0 # Apache-2.0/BSD # Hacking already pins down pep8, pyflakes and flake8 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 @@ -10,7 +9,7 @@ mock>=2.0.0 # BSD paunch>=1.0.0 # Apache-2.0 requests>=2.14.2 # Apache-2.0 requests-mock>=1.1.0 # Apache-2.0 -salt +salt>=2017.7.4 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT