Skip to content

Commit 2b7c1b8

Browse files
sivakasi-ciscosivakasi-cisco
committed
Partial lint-changes
1 parent fc4b98a commit 2b7c1b8

File tree

19 files changed

+224
-207
lines changed

19 files changed

+224
-207
lines changed

‎galaxy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
namespace: cisco
3-
name: Dcnm
3+
name: dcnm
44
version: 3.9.0-dev
55
readme: README.md
66
authors:

‎playbooks/roles/dcnm_bootflash/create_files.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
- gather_facts: false
2+
- name: Create bootflash files on switch1
3+
gather_facts: false
34
hosts:
45
- switch1
56
tasks:
@@ -13,7 +14,8 @@
1314
- echo 1 > bootflash: /{{ nxos_vars.switch1_file3 }}
1415
- echo 1 > bootflash: /{{ nxos_vars.switch1_file4 }}
1516

16-
- gather_facts: false
17+
- name: Create bootflash files on switch2
18+
gather_facts: false
1719
hosts:
1820
- switch2
1921
tasks:

‎playbooks/roles/dcnm_vpc_pair/dcnm_hosts.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ all:
1414
hosts:
1515
nac-ndfc1:
1616
ansible_host: 10.10.5.1
17-

‎plugins/modules/dcnm_fabric.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3603,16 +3603,16 @@
36033603
interface Ethernet1/1-16
36043604
description managed by NDFC
36053605
DEPLOY: false
3606-
- FABRIC_NAME: BGP_Fabric
3606+
- FABRIC_NAME: BGP_Fabric
36073607
FABRIC_TYPE: BGP
36083608
BGP_AS: 65001
36093609
SUPER_SPINE_BGP_AS: 65002
36103610
DEPLOY: false
3611-
- FABRIC_NAME: MSD_Fabric
3611+
- FABRIC_NAME: MSD_Fabric
36123612
FABRIC_TYPE: VXLAN_EVPN_MSD
36133613
LOOPBACK100_IP_RANGE: 10.22.0.0/24
36143614
DEPLOY: false
3615-
- FABRIC_NAME: LAN_Fabric
3615+
- FABRIC_NAME: LAN_Fabric
36163616
FABRIC_TYPE: LAN_CLASSIC
36173617
BOOTSTRAP_ENABLE: false
36183618
IS_READ_ONLY: false
@@ -3652,14 +3652,14 @@
36523652
FABRIC_TYPE: VXLAN_EVPN
36533653
BGP_AS: 65000
36543654
DEPLOY: false
3655-
- FABRIC_NAME: BGP_Fabric
3655+
- FABRIC_NAME: BGP_Fabric
36563656
FABRIC_TYPE: BGP
36573657
BGP_AS: 65001
36583658
DEPLOY: false
3659-
- FABRIC_NAME: MSD_Fabric
3659+
- FABRIC_NAME: MSD_Fabric
36603660
FABRIC_TYPE: VXLAN_EVPN_MSD
36613661
DEPLOY: false
3662-
- FABRIC_NAME: LAN_Fabric
3662+
- FABRIC_NAME: LAN_Fabric
36633663
FABRIC_TYPE: LAN_CLASSIC
36643664
DEPLOY: false
36653665
register: result

‎plugins/modules/dcnm_image_policy.py‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -150,50 +150,50 @@
150150
# Delete two image policies from the controller.
151151
152152
- name: Delete Image policies
153-
cisco.dcnm.dcnm_image_policy:
154-
state: deleted
155-
config:
156-
- name: KR5M
157-
- name: NR3F
158-
register: result
159-
- name: print result
160-
ansible.builtin.debug:
161-
var: result
153+
cisco.dcnm.dcnm_image_policy:
154+
state: deleted
155+
config:
156+
- name: KR5M
157+
- name: NR3F
158+
register: result
159+
- name: print result
160+
ansible.builtin.debug:
161+
var: result
162162
163163
# Merge two image policies into the controller.
164164
165-
- name: Merge Image policies
166-
cisco.dcnm.dcnm_image_policy:
167-
state: merged
168-
config:
169-
- name: KR5M
170-
agnostic: false
171-
description: KR5M
172-
epld_image: n9000-epld.10.2.5.M.img
173-
packages:
174-
install:
175-
- mtx-openconfig-all-2.0.0.0-10.4.1.src.rpm
176-
uninstall:
177-
- mtx-grpctunnel-2.1.0.0-10.4.1.lib32_64_n9000
178-
platform: N9K
179-
release: 10.2.5_nxos64-cs_64bit
180-
type: PLATFORM
181-
- name: NR3F
182-
description: NR3F
183-
platform: N9K
184-
epld_image: n9000-epld.10.3.1.F.img
185-
release: 10.3.1_nxos64-cs_64bit
186-
register: result
187-
- name: print result
188-
ansible.builtin.debug:
189-
var: result
165+
- name: Merge Image policies
166+
cisco.dcnm.dcnm_image_policy:
167+
state: merged
168+
config:
169+
- name: KR5M
170+
agnostic: false
171+
description: KR5M
172+
epld_image: n9000-epld.10.2.5.M.img
173+
packages:
174+
install:
175+
- mtx-openconfig-all-2.0.0.0-10.4.1.src.rpm
176+
uninstall:
177+
- mtx-grpctunnel-2.1.0.0-10.4.1.lib32_64_n9000
178+
platform: N9K
179+
release: 10.2.5_nxos64-cs_64bit
180+
type: PLATFORM
181+
- name: NR3F
182+
description: NR3F
183+
platform: N9K
184+
epld_image: n9000-epld.10.3.1.F.img
185+
release: 10.3.1_nxos64-cs_64bit
186+
register: result
187+
- name: print result
188+
ansible.builtin.debug:
189+
var: result
190190
191191
# Override all policies on the controller and replace them with
192192
# the policies in the playbook task. Any policies other than
193193
# KR5M and NR3F are deleted from the controller.
194194
195-
- name: Override Image policies
196-
cisco.dcnm.dcnm_image_policy:
195+
- name: Override Image policies
196+
cisco.dcnm.dcnm_image_policy:
197197
state: overridden
198198
config:
199199
- name: KR5M

‎plugins/modules/dcnm_image_upgrade.py‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -317,63 +317,63 @@
317317
# Attach image policy NR3F to two devices
318318
# Stage and validate the image on two devices but do not upgrade
319319
- name: stage/validate images
320-
cisco.dcnm.dcnm_image_upgrade:
321-
state: merged
322-
config:
323-
policy: NR3F
324-
stage: true
325-
validate: true
326-
upgrade:
327-
nxos: false
328-
epld: false
329-
switches:
330-
- ip_address: 192.168.1.1
331-
- ip_address: 192.168.1.2
320+
cisco.dcnm.dcnm_image_upgrade:
321+
state: merged
322+
config:
323+
policy: NR3F
324+
stage: true
325+
validate: true
326+
upgrade:
327+
nxos: false
328+
epld: false
329+
switches:
330+
- ip_address: 192.168.1.1
331+
- ip_address: 192.168.1.2
332332
333333
# Attach image policy NR1F to device 192.168.1.1
334334
# Attach image policy NR2F to device 192.168.1.2
335335
# Stage the image on device 192.168.1.1, but do not upgrade
336336
# Stage the image and upgrade device 192.168.1.2
337-
- name: stage/upgrade devices
338-
cisco.dcnm.dcnm_image_upgrade:
339-
state: merged
340-
config:
341-
validate: false
342-
stage: false
343-
upgrade:
344-
nxos: false
345-
epld: false
346-
options:
347-
nxos:
348-
mode: disruptive
349-
epld:
350-
module: ALL
351-
golden: false
352-
switches:
353-
- ip_address: 192.168.1.1
354-
policy: NR1F
355-
stage: true
356-
validate: true
357-
upgrade:
358-
nxos: true
359-
epld: false
360-
- ip_address: 192.168.1.2
361-
policy: NR2F
362-
stage: true
363-
validate: true
364-
upgrade:
365-
nxos: true
366-
epld: true
367-
options:
368-
nxos:
369-
mode: disruptive
370-
epld:
371-
module: ALL
372-
golden: false
337+
- name: stage/upgrade devices
338+
cisco.dcnm.dcnm_image_upgrade:
339+
state: merged
340+
config:
341+
validate: false
342+
stage: false
343+
upgrade:
344+
nxos: false
345+
epld: false
346+
options:
347+
nxos:
348+
mode: disruptive
349+
epld:
350+
module: ALL
351+
golden: false
352+
switches:
353+
- ip_address: 192.168.1.1
354+
policy: NR1F
355+
stage: true
356+
validate: true
357+
upgrade:
358+
nxos: true
359+
epld: false
360+
- ip_address: 192.168.1.2
361+
policy: NR2F
362+
stage: true
363+
validate: true
364+
upgrade:
365+
nxos: true
366+
epld: true
367+
options:
368+
nxos:
369+
mode: disruptive
370+
epld:
371+
module: ALL
372+
golden: false
373373
374374
# Detach image policy NR3F from two devices
375-
- name: stage/upgrade devices
376-
cisco.dcnm.dcnm_image_upgrade:
375+
- name: stage/upgrade devices
376+
cisco.dcnm.dcnm_image_upgrade:
377377
state: deleted
378378
config:
379379
policy: NR3F

‎plugins/modules/dcnm_inventory.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -267,19 +267,19 @@
267267
state: merged # merged / deleted / overridden / query
268268
config:
269269
- seed_ip: 192.168.0.1
270-
auth_proto: MD5 # choose from [MD5, SHA, MD5_DES, MD5_AES, SHA_DES, SHA_AES]
270+
auth_proto: MD5 # choose from [MD5, SHA, MD5_DES, MD5_AES, SHA_DES, SHA_AES]
271271
user_name: switch_username
272272
password: switch_password
273273
max_hops: 0
274274
role: spine
275275
preserve_config: false # boolean, default is true
276-
- seed_ip: 192.168.0.2
277-
auth_proto: MD5 # choose from [MD5, SHA, MD5_DES, MD5_AES, SHA_DES, SHA_AES]
278-
user_name: switch_username
279-
password: switch_password
280-
max_hops: 0
281-
role: leaf
282-
preserve_config: false # boolean, default is true
276+
- seed_ip: 192.168.0.2
277+
auth_proto: MD5 # choose from [MD5, SHA, MD5_DES, MD5_AES, SHA_DES, SHA_AES]
278+
user_name: switch_username
279+
password: switch_password
280+
max_hops: 0
281+
role: leaf
282+
preserve_config: false # boolean, default is true
283283
284284
# The following two switches will be added or updated in the existing fabric and all other
285285
# switches will be removed from the fabric

0 commit comments

Comments
 (0)