Merge pull request #55 from ssol-smartcs/develop

merge develop to master before 16th handson
ssol-smartcs · Sep 18, 2024 · db0ad2b · db0ad2b
2 parents 91da6aa + 299d321
commit db0ad2b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,12 @@ SmartCS x Ansible のハンズオンコンテンツをまとめたページと
 
 # ハンズオン コンテンツ
 
-### [SmartCS x IOS x Ansible ハンズオン(第15回)](./SmartCSxIOS_short-course/README.md)
+### [SmartCS x IOS x Ansible ハンズオン(第16回)](./SmartCSxIOS_short-course/README.md)
+
+- 時間：2024年9月19日（木）13時30分〜16時30分（受付13時20分より）  
+場所：オンライン開催＠Zoom
+
+### [SmartCS x IOS x Ansible ハンズオン(第15回)](https://github.com/ssol-smartcs/ansible-handson/blob/2024.04.17/SmartCSxIOS_short-course/README.md)
 
 - 時間：2024年4月17日（水）13時30分〜16時30分（受付13時20分より）  
 場所：オンライン開催＠Zoom

diff --git a/SmartCSxIOS_short-course/2.1-initial_setup_the_ios_device_via_smartcs.md b/SmartCSxIOS_short-course/2.1-initial_setup_the_ios_device_via_smartcs.md
@@ -129,7 +129,7 @@ vi ios_show_version.yml
   gather_facts: no
 
   vars:
-  - tty_no: "{{ hostvars['ios']['smartcs_tty'] }}" 
+    tty_no: "{{ hostvars['ios']['smartcs_tty'] }}" 
 
   tasks:
   - name: show version (IOS command)
@@ -281,9 +281,9 @@ Playbookの内容は、下記の様になります。
   gather_facts: no
 
   vars:
-  - tty_no: "{{ hostvars['ios']['smartcs_tty'] }}" 
-  - ios_user: "{{ hostvars['ios']['ansible_user'] }}" 
-  - ios_password: "{{ hostvars['ios']['ansible_password'] }}" 
+    tty_no: "{{ hostvars['ios']['smartcs_tty'] }}" 
+    ios_user: "{{ hostvars['ios']['ansible_user'] }}" 
+    ios_password: "{{ hostvars['ios']['ansible_password'] }}" 
 
   tasks:
   - name: rename login user and setting password
@@ -430,13 +430,13 @@ vi ios_initial_setting_v2_ansible_reach.yml
   gather_facts: no
 
   vars:
-  - tty_no: "{{ hostvars['ios']['smartcs_tty'] }}"
-  - ios_ipaddr: "{{ hostvars['ios']['ansible_host'] }}"
-  - ios_user: "{{ hostvars['ios']['ansible_user'] }}"
-  - ios_password: "{{ hostvars['ios']['ansible_password'] }}"
+    tty_no: "{{ hostvars['ios']['smartcs_tty'] }}"
+    ios_ipaddr: "{{ hostvars['ios']['ansible_host'] }}"
+    ios_user: "{{ hostvars['ios']['ansible_user'] }}"
+    ios_password: "{{ hostvars['ios']['ansible_password'] }}"
 
-  - ios_subnet: '255.255.255.0'
-  - ios_gateway: '192.168.128.254'
+    ios_subnet: '255.255.255.0'
+    ios_gateway: '192.168.128.254'
 
   tasks:
   - name: setting ipaddr and ssh

diff --git a/SmartCSxIOS_short-course/2.2-additional_setup_the_ios_device.md b/SmartCSxIOS_short-course/2.2-additional_setup_the_ios_device.md
@@ -141,12 +141,12 @@ vi add_vlan.yml
   gather_facts: no
 
   vars:
-  - ansible_command_timeout: 60
+    ansible_command_timeout: 60
 
-  - vid: '100'
-  - ipaddr: '192.168.0.1'
-  - netmask: '255.255.255.0'
-  - portif : '0/2'
+    vid: '100'
+    ipaddr: '192.168.0.1'
+    netmask: '255.255.255.0'
+    portif : '0/2'
 
   tasks:
   - name: configure vlan
@@ -409,17 +409,17 @@ STEP3のPlaybookは、<code>host_vars/ios.yml</code>に設定する内容を記
 その場合、varsに以下の変数を記載します。
 ```
   vars: 
-  - ntp:
+    ntp:
       server:
         - 192.168.127.2
         - 192.168.127.3
-  - snmp:
+    snmp:
       community:
         - name: public
           auth: ro
         - name: secret
           auth: rw
-  - syslog:
+    syslog:
       server:
         - 192.168.127.2
         - 192.168.127.3

diff --git a/SmartCSxIOS_short-course/2.3-get_ios_device_information.md b/SmartCSxIOS_short-course/2.3-get_ios_device_information.md
@@ -50,7 +50,7 @@ vi ios_commands.yml
   gather_facts: no
 
   vars:
-  - ansible_command_timeout: 60
+    ansible_command_timeout: 60
 
   tasks:
   - name: execute show commands
@@ -146,7 +146,7 @@ vi save_show-commands.yml
   gather_facts: no
 
   vars:
-  - ansible_command_timeout: 60
+    ansible_command_timeout: 60
 
   tasks:
   - name: execute show commands
@@ -255,7 +255,7 @@ vi save_running-config.yml
   gather_facts: no
 
   vars:
-  - ansible_command_timeout: 60
+    ansible_command_timeout: 60
 
   tasks:
   - name: gather ios facts all
@@ -350,7 +350,7 @@ vi version_check.yml
   gather_facts: no
 
   vars:
-  - os_version: "12.2"
+    os_version: "12.2"
 
   tasks:
   - name: execute show commands

diff --git a/SmartCSxIOS_short-course/2.4-setting_of_ios_device_via_smartcs.md b/SmartCSxIOS_short-course/2.4-setting_of_ios_device_via_smartcs.md
@@ -86,10 +86,10 @@ vi console_login.yml
   gather_facts: no
 
   vars:
-  - tty_no: "{{ hostvars['ios']['smartcs_tty'] }}"
-  - ios_password: "{{ hostvars['ios']['ansible_password'] }}"
+    tty_no: "{{ hostvars['ios']['smartcs_tty'] }}"
+    ios_password: "{{ hostvars['ios']['ansible_password'] }}"
 
-  - ansible_command_timeout: 60
+    ansible_command_timeout: 60
 
   tasks:
   - name: login cat3550
@@ -128,9 +128,9 @@ vi console_logout.yml
   gather_facts: no
 
   vars:
-  - tty_no: "{{ hostvars['ios']['smartcs_tty'] }}"
+    tty_no: "{{ hostvars['ios']['smartcs_tty'] }}"
 
-  - ansible_command_timeout: 60
+    ansible_command_timeout: 60
 
   tasks:
   - name: logout cat3550