openstack
/
heat-agents
Code Issues Proposed changes

Get rid of dependency on dpath 

dpath isn't in the OpenStack global requirements list, so it's one of
the things breaking the requirements job. Furthermore, it's only used on
one line, to avoid some trivial Python code. Just get rid of it.

Change-Id: I4d284894e48a20c60f9c57e0d2c0696dc348fb0b
Depends-On: https://review.openstack.org/604386
This commit is contained in:
Zane Bitter 2018-09-20 16:05:51 -04:00
parent 294969926f
commit 08ffe6bb90
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat-config-docker-compose/install.d/50-heat-config-hook-docker-compose
View File

@ -12,6 +12,6 @@ elif [ -f /etc/redhat-release ]; then
systemctl enable docker.service systemctl enable docker.service
fi 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 install -D -g root -o root -m 0755 ${SCRIPTDIR}/hook-docker-compose.py /var/lib/heat-config/hooks/docker-compose

4
heat-config-docker-compose/install.d/hook-docker-compose.py
View File

@ -13,7 +13,6 @@
# under the License. # under the License.
import ast import ast
import dpath
import json import json
import logging import logging
import os import os
@ -85,7 +84,8 @@ def main(argv=sys.argv):
os.chdir(proj) os.chdir(proj)
compose_env_files = [] 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): if isinstance(value, list):
compose_env_files.extend(value) compose_env_files.extend(value)
elif isinstance(value, six.string_types): elif isinstance(value, six.string_types):

3
test-requirements.txt
View File

@ -2,7 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
dpath>=1.3.2
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
# Hacking already pins down pep8, pyflakes and flake8 # Hacking already pins down pep8, pyflakes and flake8
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 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 paunch>=1.0.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0 requests>=2.14.2 # Apache-2.0
requests-mock>=1.1.0 # 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 testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT