openstack
/
zun
Code Issues Proposed changes

Merge "Allow imagePullPolicy to be upper case"

This commit is contained in:
Zuul 2019-04-11 04:35:57 +00:00 committed by Gerrit Code Review
parent 3f57a6fde2 06f563dbe8
commit 8648fd6485
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zun/api/controllers/v1/capsules.py
View File

@ -246,6 +246,8 @@ class CapsuleController(base.Controller):
container_dict['memory'] = str(allocation['memory'])
container_dict.pop('resources')
container_dict['image_pull_policy'] = (
container_dict.get('image_pull_policy', 'always').lower())
container_dict['status'] = consts.CREATING
container_dict['interactive'] = True
container_dict['capsule_id'] = new_capsule.id

3
zun/api/controllers/v1/schemas/parameter_types.py
View File

@ -124,7 +124,8 @@ workdir = {
image_pull_policy = {
'type': ['string', 'null'],
'enum': ['never', 'always', 'ifnotpresent', None]
'enum': ['never', 'always', 'ifnotpresent',
'Never', 'Always', 'IfNotPresent', None]
}
labels = {