diff options
| author | Chris Houseknecht <chouseknecht@ansible.com> | 2017-08-01 12:51:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 12:51:03 -0400 |
| commit | 3db768f39362bb80c8fa10794a0c69bc88aedba5 (patch) | |
| tree | 1088d1c1c3eba8bb5b24e9481911685c9c4ffb23 /lib/ansible/galaxy | |
| parent | dc5b826af85ecc363e9abd43b5e10954627ac11a (diff) | |
| download | ansible-3db768f39362bb80c8fa10794a0c69bc88aedba5.tar.gz | |
Removes container-enabled warning (#27578)
Diffstat (limited to 'lib/ansible/galaxy')
| -rw-r--r-- | lib/ansible/galaxy/role.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py index c718349810..f0800ba3d9 100644 --- a/lib/ansible/galaxy/role.py +++ b/lib/ansible/galaxy/role.py @@ -220,14 +220,9 @@ class GalaxyRole(object): if not role_data: raise AnsibleError("- sorry, %s was not found on %s." % (self.src, api.api_server)) - if role_data.get('role_type') == 'CON' and not os.environ.get('ANSIBLE_CONTAINER'): - # Container Enabled, running outside of a container - display.warning("%s is a Container Enabled role and should only be installed using " - "Ansible Container" % self.name) - if role_data.get('role_type') == 'APP': # Container Role - display.warning("%s is a Container App role and should only be installed using Ansible " + display.warning("%s is a Container App role, and should only be installed using Ansible " "Container" % self.name) role_versions = api.fetch_role_related('versions', role_data['id']) |