Skip to content

Commit

Permalink
Merge branch 'infobloxopen:master' into feature-assignvlan
Browse files Browse the repository at this point in the history
  • Loading branch information
edeka-spatt authored Aug 3, 2023
2 parents 60590bd + b0401ab commit 3dbceaa
Show file tree
Hide file tree
Showing 35 changed files with 892 additions and 67 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
name: collection
path: .cache/collection-tarballs


###
# Unit tests
Expand All @@ -48,7 +48,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [2.7, 3.8, 3.9]
python-version: [3.8, 3.9]
ansible-version: [stable-2.9, stable-2.10, stable-2.11, stable-2.12, stable-2.13, devel]
exclude:
- ansible-version: devel
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [2.7, 3.8, 3.9]
python-version: [3.8, 3.9]
ansible-version: [stable-2.9, stable-2.10, stable-2.11, stable-2.12, stable-2.13, devel]
exclude:
- ansible-version: stable-2.9
Expand All @@ -118,7 +118,7 @@ jobs:
uses: actions/setup-python@v1
with:
python-version: 3.9

- name: Check out code
uses: actions/checkout@v2

Expand All @@ -130,10 +130,10 @@ jobs:
with:
name: collection
path: .cache/collection-tarball

- name: Install the collection tarball
run: ansible-galaxy collection install .cache/collection-tarball/*.tar.gz

- name: Setup Integration test Pre-requisites
run: |
sudo apt install libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0
Expand All @@ -145,7 +145,7 @@ jobs:
echo $ANSIBLE_NIOSSIM_CONTAINER
ansible-test integration -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python-version }} --docker --coverage
env:
ANSIBLE_NIOSSIM_CONTAINER: quay.io/ansible/nios-test-container:1.4.0
ANSIBLE_NIOSSIM_CONTAINER: quay.io/ansible/nios-test-container:2.0.0
working-directory: /home/runner/.ansible/collections/ansible_collections/infoblox/nios_modules/

# ansible-test support producing code coverage date
Expand All @@ -156,8 +156,8 @@ jobs:
- uses: codecov/codecov-action@v1
with:
fail_ci_if_error: false


###
# Sanity tests (REQUIRED)
#
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ __pycache__/
# Distribution / packaging
.Python
env/
.direnv/
build/
develop-eggs/
dist/
Expand Down Expand Up @@ -99,3 +100,10 @@ ENV/

# mypy
.mypy_cache/
infoblox-ansible.code-workspace

# Ansible sanity test ouput
**/ansible-test-sanity-*.json

# Dev tools
.vscode/
27 changes: 27 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,33 @@ Infoblox.Nios_Modules Release Notes

.. contents:: Topics

v1.5.0
======

Release Summary
---------------
- Added new module - NIOS Range with Create, Update and Delete features
- Added new feature - Member Assignment to Networks with add and remove functionality
- Fixes Unable to Update/Delete EAs using Ansible plugin
- Fixes Static Allocation of IPV4 address of A Record
- Updates default WAPI version to 2.9
- Added Grid Master Candidate feature

Major Changes
-------------
- Added NIOS Range module with Create, Update and Delete features `#152 <https://github.com/infobloxopen/infoblox-ansible/pull/152>`_
- Added Member Assignment to network and ranges `#152 <https://github.com/infobloxopen/infoblox-ansible/pull/152>`_
- Added Grid Master Candidate feature `#152 <https://github.com/infobloxopen/infoblox-ansible/pull/152>`_
- Fixes issue unable to update/delete EAs using Ansible plugin `#180 <https://github.com/infobloxopen/infoblox-ansible/pull/180>`_
- Fixes static and dynamic allocation of IPV4 address of A Record `#182 <https://github.com/infobloxopen/infoblox-ansible/pull/182>`_
- Fixes to Update host name of NIOS member `#176 <https://github.com/infobloxopen/infoblox-ansible/pull/176>`_
- Updates default WAPI version to 2.9 `#176 <https://github.com/infobloxopen/infoblox-ansible/pull/176>`_

Bugfixes
---------
- Fixes Update A Record having multiple records with same name and different IP `#182 <https://github.com/infobloxopen/infoblox-ansible/pull/182>`_


v1.4.1
======

Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ Modules

- `nios_ptr_record` – Configure Infoblox NIOS PTR records

- `nios_range` - Configure Infoblox NIOS Network Range object

- `nios_restartservices` - Controlled restart of Infoblox NIOS services

- `nios_srv_record` – Configure Infoblox NIOS SRV records
Expand All @@ -77,11 +79,11 @@ Installation
Dependencies
------------

- Python version 2.7 or later
- Python version 3.8 or later

- Ansible version 2.9.0 or later
- Ansible version 2.12 or later

- NIOS 8.2.4 or later
- NIOS 8.5.x or later

Prerequisites
-------------
Expand Down Expand Up @@ -164,7 +166,7 @@ Dates TBD
Current release
---------------
1.4.1 on 24 November 2022
1.5.0 on 11 May 2023
Versioning
=========
Expand Down
2 changes: 1 addition & 1 deletion changelogs/.plugin-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@ plugins:
shell: {}
strategy: {}
vars: {}
version: 1.4.1
version: 1.5.0
19 changes: 19 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,22 @@ releases:
Fixes issue to allocate ip to a_record dynamically,
Updates `nios_a_record` name with multiple ips having same name'
release_date: '2022-11-24'
1.5.0:
changes:
major_changes:
- Added NIOS Range module with Create, Update and Delete features `#152 <https://github.com/infobloxopen/infoblox-ansible/pull/152>`_
- Added Member Assignment to network and ranges `#152 <https://github.com/infobloxopen/infoblox-ansible/pull/152>`_
- Added Grid Master Candidate feature `#152 <https://github.com/infobloxopen/infoblox-ansible/pull/152>`_
- Fixes issue unable to update/delete EAs using Ansible plugin `#180 <https://github.com/infobloxopen/infoblox-ansible/pull/180>`_
- Fixes static and dynamic allocation of IPV4 address of A Record `#182 <https://github.com/infobloxopen/infoblox-ansible/pull/182>`_
- Fixes to Update host name of NIOS member `#176 <https://github.com/infobloxopen/infoblox-ansible/pull/176>`_
- Updates default WAPI version to 2.9 `#176 <https://github.com/infobloxopen/infoblox-ansible/pull/176>`_
bugfixes:
- Fixes Update A Record having multiple records with same name and different IP `#182 <https://github.com/infobloxopen/infoblox-ansible/pull/182>`_
release_summary: 'Added new module NIOS Range with Create, Update and Delete features,
Added new feature Member Assignment to Networks with add and remove functionality,
Fixes Unable to Update/Delete EAs using Ansible plugin,
Fixes Static Allocation of IPV4 address of A Record,
Updates default WAPI version to `2.9`,
Added Grid Master Candidate feature'
release_date: '2023-05-11'
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace: infoblox
name: nios_modules

# The version of the collection. Must be compatible with semantic versioning
version: 1.4.1
version: 1.5.0

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down
22 changes: 22 additions & 0 deletions playbooks/update_member.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---

- hosts: localhost
vars:
nios_provider:
host: 10.34.10.724
username: admin
password: cloudadmin
connection: local
tasks:
- name: create member
infoblox.nios_modules.nios_member:
host_name: {old_name: block1.localdomain, new_name: member01.localdomain}
master_candidate: false
vip_setting:
- address: 120.0.0.25
subnet_mask: 255.255.255.0
gateway: 120.0.0.1
config_addr_type: IPV4
platform: VNIOS
state: present
provider: "{{ nios_provider }}"
2 changes: 1 addition & 1 deletion plugins/doc_fragments/nios.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ModuleDocFragment(object):
variable.
- Until ansible 2.8 the default WAPI was 1.4
type: str
default: '2.1'
default: '2.9'
max_results:
description:
- Specifies the maximum number of objects to be returned,
Expand Down
Loading

0 comments on commit 3dbceaa

Please sign in to comment.