cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

For container enabled role, display warning only when not ANSIBLE_CONTAINER (#18717)

Browse source
This commit is contained in:
Chris Houseknecht 2016-12-02 10:08:10 -05:00 committed by GitHub
parent a252d71573
commit 599e016315
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/galaxy/role.py
View file

@ -212,8 +212,8 @@ class GalaxyRole(object):
if not role_data: if not role_data:
raise AnsibleError("- sorry, %s was not found on %s." % (self.src, api.api_server)) raise AnsibleError("- sorry, %s was not found on %s." % (self.src, api.api_server))
if role_data.get('role_type') == 'CON': if role_data.get('role_type') == 'CON' and not os.environ.get('ANSIBLE_CONTAINER'):
# Container Enabled # Container Enabled, running outside of a container
display.warning("%s is a Container Enabled role and should only be installed using " display.warning("%s is a Container Enabled role and should only be installed using "
"Ansible Container" % self.name) "Ansible Container" % self.name)