From c560dc7c083a672239c30ad287435cd4dc1338a8 Mon Sep 17 00:00:00 2001 From: wypior Date: Fri, 21 Jun 2024 23:02:11 +0000 Subject: [PATCH 1/4] Merging devel changes - 2024-06-21T23:01:58Z --- ansible_collections/f5networks/f5_modules/galaxy.yml | 2 +- .../f5networks/f5_modules/plugins/module_utils/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible_collections/f5networks/f5_modules/galaxy.yml b/ansible_collections/f5networks/f5_modules/galaxy.yml index 67bf31e..b699896 100644 --- a/ansible_collections/f5networks/f5_modules/galaxy.yml +++ b/ansible_collections/f5networks/f5_modules/galaxy.yml @@ -19,4 +19,4 @@ tags: - networking - bigip - bigiq -version: 1.29.0 +version: 1.30.0-devel diff --git a/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py b/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py index 22acd0f..ee5dc21 100644 --- a/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py +++ b/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py @@ -4,4 +4,4 @@ # GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # This collection version needs to be updated at each release -CURRENT_COLL_VERSION = "1.29.0" +CURRENT_COLL_VERSION = "1.30.0-devel" From 7b56b0444efe092259f200c066222d99aab1a8f6 Mon Sep 17 00:00:00 2001 From: wypior Date: Tue, 23 Jul 2024 23:02:23 +0000 Subject: [PATCH 2/4] Merging devel changes - 2024-07-23T23:02:09Z --- .../changelogs/fragments/bigip-ucs-restore-fix.yaml | 3 +++ .../f5networks/f5_modules/plugins/modules/bigip_ucs.py | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml diff --git a/ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml b/ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml new file mode 100644 index 0000000..6a4e6f3 --- /dev/null +++ b/ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: + - bigip_ucs - Fix for bigip_ucs module to restore UCS file on BIG-IP devices. \ No newline at end of file diff --git a/ansible_collections/f5networks/f5_modules/plugins/modules/bigip_ucs.py b/ansible_collections/f5networks/f5_modules/plugins/modules/bigip_ucs.py index e4ddfb3..e1cbe3e 100644 --- a/ansible_collections/f5networks/f5_modules/plugins/modules/bigip_ucs.py +++ b/ansible_collections/f5networks/f5_modules/plugins/modules/bigip_ucs.py @@ -652,6 +652,13 @@ def install_on_device(self): elif 'remoteSender' in str(ex): # catching some edge cases where API becomes unstable after installation pass + elif 'Proxy Error' in str(ex): + # catching some edge cases where API becomes unstable after installation + pass + elif 'object has no attribute' in str(ex): + pass + elif 'Expecting value' in str(ex): + pass else: raise F5ModuleError(str(ex)) self.wait_for_rest_api_restart() From eb9cc936f61ce95f3dfe7e50d85e53dca217b6dc Mon Sep 17 00:00:00 2001 From: wypior Date: Wed, 31 Jul 2024 23:02:24 +0000 Subject: [PATCH 3/4] Merging devel changes - 2024-07-31T23:02:12Z --- ansible_collections/f5networks/f5_modules/galaxy.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ansible_collections/f5networks/f5_modules/galaxy.yml b/ansible_collections/f5networks/f5_modules/galaxy.yml index b699896..95351ac 100644 --- a/ansible_collections/f5networks/f5_modules/galaxy.yml +++ b/ansible_collections/f5networks/f5_modules/galaxy.yml @@ -1,5 +1,6 @@ authors: - Wojciech Wypior (@wojtek0806) + - Rohit Upadhyay (@urohit011) dependencies: ansible.netcommon: ">=2.0.0" description: F5 BIG-IP Imperative Collection for Ansible @@ -12,7 +13,12 @@ name: f5_modules namespace: f5networks readme: README.md build_ignore: - - tests + - tests/*.ini + - tests/*.py + - tests/.pytest_cache + - tests/module_utils + - tests/utils + - tests/sanity repository: https://github.com/F5Networks/f5-ansible-f5modules tags: - f5 From dc14185c6699eb0247e5a883ec6c1a327b290589 Mon Sep 17 00:00:00 2001 From: rupadhyay Date: Thu, 1 Aug 2024 09:01:17 +0000 Subject: [PATCH 4/4] Version 1.30.0 release --- .../f5networks/f5_modules/CHANGELOG.rst | 8 ++++++++ .../f5networks/f5_modules/changelogs/changelog.yaml | 7 +++++++ .../changelogs/fragments/bigip-ucs-restore-fix.yaml | 3 --- ansible_collections/f5networks/f5_modules/galaxy.yml | 10 ++-------- .../f5_modules/plugins/module_utils/version.py | 2 +- 5 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml diff --git a/ansible_collections/f5networks/f5_modules/CHANGELOG.rst b/ansible_collections/f5networks/f5_modules/CHANGELOG.rst index 0a71759..7387049 100644 --- a/ansible_collections/f5networks/f5_modules/CHANGELOG.rst +++ b/ansible_collections/f5networks/f5_modules/CHANGELOG.rst @@ -4,6 +4,14 @@ F5Networks F5\_Modules Collection Release Notes .. contents:: Topics +v1.30.0 +======= + +Minor Changes +------------- + +- bigip_ucs - Fix for bigip_ucs module to restore UCS file on BIG-IP devices. + v1.29.0 ======= diff --git a/ansible_collections/f5networks/f5_modules/changelogs/changelog.yaml b/ansible_collections/f5networks/f5_modules/changelogs/changelog.yaml index 70abc00..d048a94 100644 --- a/ansible_collections/f5networks/f5_modules/changelogs/changelog.yaml +++ b/ansible_collections/f5networks/f5_modules/changelogs/changelog.yaml @@ -1132,6 +1132,13 @@ releases: name: bigip_ssl_csr namespace: '' release_date: '2020-04-22' + 1.30.0: + changes: + minor_changes: + - bigip_ucs - Fix for bigip_ucs module to restore UCS file on BIG-IP devices. + fragments: + - bigip-ucs-restore-fix.yaml + release_date: '2024-08-01' 1.4.0: changes: bugfixes: diff --git a/ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml b/ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml deleted file mode 100644 index 6a4e6f3..0000000 --- a/ansible_collections/f5networks/f5_modules/changelogs/fragments/bigip-ucs-restore-fix.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -minor_changes: - - bigip_ucs - Fix for bigip_ucs module to restore UCS file on BIG-IP devices. \ No newline at end of file diff --git a/ansible_collections/f5networks/f5_modules/galaxy.yml b/ansible_collections/f5networks/f5_modules/galaxy.yml index 95351ac..36f24f6 100644 --- a/ansible_collections/f5networks/f5_modules/galaxy.yml +++ b/ansible_collections/f5networks/f5_modules/galaxy.yml @@ -1,6 +1,5 @@ authors: - Wojciech Wypior (@wojtek0806) - - Rohit Upadhyay (@urohit011) dependencies: ansible.netcommon: ">=2.0.0" description: F5 BIG-IP Imperative Collection for Ansible @@ -13,16 +12,11 @@ name: f5_modules namespace: f5networks readme: README.md build_ignore: - - tests/*.ini - - tests/*.py - - tests/.pytest_cache - - tests/module_utils - - tests/utils - - tests/sanity + - tests repository: https://github.com/F5Networks/f5-ansible-f5modules tags: - f5 - networking - bigip - bigiq -version: 1.30.0-devel +version: 1.30.0 diff --git a/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py b/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py index ee5dc21..18a6db6 100644 --- a/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py +++ b/ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py @@ -4,4 +4,4 @@ # GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # This collection version needs to be updated at each release -CURRENT_COLL_VERSION = "1.30.0-devel" +CURRENT_COLL_VERSION = "1.30.0"