From 3db768f39362bb80c8fa10794a0c69bc88aedba5 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 1 Aug 2017 12:51:03 -0400 Subject: [PATCH] Removes container-enabled warning (#27578) --- lib/ansible/galaxy/role.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py index c7183498107..f0800ba3d95 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'])