Attachment #200071 for bug #233970

View | Details | Raw Unified | Return to bug 233970
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2		2
3	PORTNAME= ansible	3	PORTNAME= ansible
4	PORTVERSION?= 2.7.2	4	PORTVERSION?= 2.7.2
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
7	MASTER_SITES= http://releases.ansible.com/ansible/	7	MASTER_SITES= http://releases.ansible.com/ansible/
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}




--- lib/ansible/module_utils/facts/virtual/freebsd.py.orig	2018-10-25 02:45:26 UTC
+++ lib/ansible/module_utils/facts/virtual/freebsd.py
@@ -19,9 +19,10 @@ __metaclass__ = type
 import os
 
 from ansible.module_utils.facts.virtual.base import Virtual, VirtualCollector
+from ansible.module_utils.facts.virtual.sysctl import VirtualSysctlDetectionMixin
 
 
-class FreeBSDVirtual(Virtual):
+class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin):
     """
     This is a FreeBSD-specific subclass of Virtual.  It defines
     - virtualization_type
@@ -35,6 +36,9 @@ class FreeBSDVirtual(Virtual):
         virtual_facts['virtualization_type'] = ''
         virtual_facts['virtualization_role'] = ''
 
+        virtual_product_facts = self.detect_virt_product('hw.hv_vendor')
+        virtual_facts.update(virtual_product_facts)
+
         if os.path.exists('/dev/xen/xenstore'):
             virtual_facts['virtualization_type'] = 'xen'
             virtual_facts['virtualization_role'] = 'guest'




--- lib/ansible/modules/packaging/os/pkgng.py.orig	2018-10-24 02:17:26 UTC
+++ lib/ansible/modules/packaging/os/pkgng.py
@@ -201,13 +201,13 @@ def install_packages(module, pkgng_path,
 
     # This environment variable skips mid-install prompts,
     # setting them to their default values.
-    batch_var = 'env BATCH=yes'
+    batch_var = 'env BATCH=yes ASSUME_ALWAYS_YES=yes'
 
     if not module.check_mode and not cached:
         if old_pkgng:
-            rc, out, err = module.run_command("%s %s update" % (pkgsite, pkgng_path))
+            rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgsite, pkgng_path))
         else:
-            rc, out, err = module.run_command("%s %s update" % (pkgng_path, dir_arg))
+            rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgng_path, dir_arg))
         if rc != 0:
             module.fail_json(msg="Could not update catalogue")
 

Line 0 Link Here

(-)files/patch-lib__ansible__modules__storage__zfs__zfs.py (+11 lines)
	1	--- lib/ansible/modules/storage/zfs/zfs.py.orig 2018-11-07 02:46:41 UTC
	2	+++ lib/ansible/modules/storage/zfs/zfs.py
	3	@@ -102,7 +102,7 @@ class Zfs(object):
	4	self.changed = False
	5	self.zfs_cmd = module.get_bin_path('zfs', True)
	6	self.zpool_cmd = module.get_bin_path('zpool', True)
	7	- self.pool = name.split('/')[0]
	8	+ self.pool = name.split('@')[0].split('/')[0]
	9	self.is_solaris = os.uname()[0] == 'SunOS'
	10	self.is_openzfs = self.check_openzfs()
	11	self.enhanced_sharing = self.check_enhanced_sharing()




--- lib/ansible/playbook/play_context.py.orig	2018-10-10 00:56:07 UTC
+++ lib/ansible/playbook/play_context.py
@@ -528,8 +528,10 @@ class PlayContext(Base):
                 becomecmd = cmd
 
             elif self.become_method == 'doas':
+                def detect_doas_prompt(b_data):
+                    return re.match(b"[Pp]assword:", b_data)
 
-                prompt = 'doas (%s@' % self.remote_user
+                prompt = detect_doas_prompt
                 exe = self.become_exe or 'doas'
 
                 if not self.become_pass:

Return to bug 233970

Line 0 Link Here

(-)files/patch-lib__ansible__module_utils__facts__virtual__freebsd.py (+24 lines)
	1	--- lib/ansible/module_utils/facts/virtual/freebsd.py.orig 2018-10-25 02:45:26 UTC
	2	+++ lib/ansible/module_utils/facts/virtual/freebsd.py
	3	@@ -19,9 +19,10 @@ __metaclass__ = type
	4	import os
	5
	6	from ansible.module_utils.facts.virtual.base import Virtual, VirtualCollector
	7	+from ansible.module_utils.facts.virtual.sysctl import VirtualSysctlDetectionMixin
	8
	9
	10	-class FreeBSDVirtual(Virtual):
	11	+class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin):
	12	"""
	13	This is a FreeBSD-specific subclass of Virtual. It defines
	14	- virtualization_type
	15	@@ -35,6 +36,9 @@ class FreeBSDVirtual(Virtual):
	16	virtual_facts['virtualization_type'] = ''
	17	virtual_facts['virtualization_role'] = ''
	18
	19	+ virtual_product_facts = self.detect_virt_product('hw.hv_vendor')
	20	+ virtual_facts.update(virtual_product_facts)
	21	+
	22	if os.path.exists('/dev/xen/xenstore'):
	23	virtual_facts['virtualization_type'] = 'xen'
	24	virtual_facts['virtualization_role'] = 'guest'

Line 0 Link Here

(-)files/patch-lib__ansible__modules__packaging__os__pkgng.py (+19 lines)
	1	--- lib/ansible/modules/packaging/os/pkgng.py.orig 2018-10-24 02:17:26 UTC
	2	+++ lib/ansible/modules/packaging/os/pkgng.py
	3	@@ -201,13 +201,13 @@ def install_packages(module, pkgng_path,
	4
	5	# This environment variable skips mid-install prompts,
	6	# setting them to their default values.
	7	- batch_var = 'env BATCH=yes'
	8	+ batch_var = 'env BATCH=yes ASSUME_ALWAYS_YES=yes'
	9
	10	if not module.check_mode and not cached:
	11	if old_pkgng:
	12	- rc, out, err = module.run_command("%s %s update" % (pkgsite, pkgng_path))
	13	+ rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgsite, pkgng_path))
	14	else:
	15	- rc, out, err = module.run_command("%s %s update" % (pkgng_path, dir_arg))
	16	+ rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgng_path, dir_arg))
	17	if rc != 0:
	18	module.fail_json(msg="Could not update catalogue")
	19

Line 0 Link Here

(-)files/patch-lib__ansible__playbook__play_context.py (+14 lines)
	1	--- lib/ansible/playbook/play_context.py.orig 2018-10-10 00:56:07 UTC
	2	+++ lib/ansible/playbook/play_context.py
	3	@@ -528,8 +528,10 @@ class PlayContext(Base):
	4	becomecmd = cmd
	5
	6	elif self.become_method == 'doas':
	7	+ def detect_doas_prompt(b_data):
	8	+ return re.match(b"[Pp]assword:", b_data)
	9
	10	- prompt = 'doas (%s@' % self.remote_user
	11	+ prompt = detect_doas_prompt
	12	exe = self.become_exe or 'doas'
	13
	14	if not self.become_pass: