Removed trailing spaces

ioggstream · ioggstream · commit 1837633bcb23 · 2017-11-22T21:30:38.000+01:00
diff --git a/ansible-101/Makefile b/ansible-101/Makefile
@@ -17,9 +17,9 @@ clean:
 	rm *.pyc __pycache__ -fr
 	find notebooks -name '*_removed.nbconvert.ipynb' -delete
 	find notebooks -name '*_removed.ipynb' -delete
-	find notebooks -name '*.ipynb' -exec  jupyter nbconvert --clear-output {} \;
-	find notebooks -name \*.yml -type f -exec sed -i 's/[[:space:]]*$//' {} \;
+	find notebooks -name \*.yml -type f -exec sed -i 's/[[:space:]]*$$//' {} \;
 	find notebooks -name \*.yml -type f -exec ansible-lint {} \;
+	find notebooks -name '*.ipynb' -exec  nbstripout {} \;
 	# $(foreach dpath, $(EXTERNAL_COURSES), rm -f notebooks/$(dpath)/*.ipynb; )
 
 clean-other:
diff --git a/ansible-101/notebooks/exercise-07/.add_key.yml b/ansible-101/notebooks/exercise-07/.add_key.yml
@@ -19,10 +19,10 @@
     authorized_key:
       user: fizz
       state: present
-      key: "{{ lookup('file', '/tmp/id_ecdsa_new.pub') }}" 
+      key: "{{ lookup('file', '/tmp/id_ecdsa_new.pub') }}"
 
   - name: Add host as ip
-    add_host: 
+    add_host:
       ansible_ssh_host: "{{ansible_default_ipv4.address}}"
       hostname: "{{ansible_default_ipv4.address}}"
       groups: test
@@ -38,5 +38,5 @@
   tasks:
   - name: Just ping
     shell: hostname
-    
-  
+
+
diff --git a/ansible-101/notebooks/exercise-07/add_key.yml b/ansible-101/notebooks/exercise-07/add_key.yml
@@ -1,7 +1,7 @@
 - hosts: web
   tasks:
   - name: Create a new keypair on localhost
-    delegate_to: 
+    delegate_to:
     run_once: yes
     user:
       name: root
@@ -18,12 +18,12 @@
       Install remotely a local PK. Use the
       authorized_key docs to complete this task
     authorized_key:
-      user: 
-      state: 
+      user:
+      state:
 
   - name: Add this host to the inventory
-    add_host: 
-      ansible_ssh_host: 
+    add_host:
+      ansible_ssh_host:
       hostname: "{{ansible_default_ipv4.address}}"
       groups: test
 
@@ -45,5 +45,5 @@
   tasks:
   - name: A test command
     shell: hostname
-    
-  
+
+
diff --git a/ansible-101/notebooks/exercise-07/debug.yml b/ansible-101/notebooks/exercise-07/debug.yml
@@ -4,7 +4,7 @@
   tasks:
   - name: This is the debug module.
     debug: msg="A string"
-    
+
   - name: The debug module can print a variable too
     debug: var=ansible_hostname
 
@@ -13,7 +13,7 @@
   name: those tasks are run on every web host
   tasks:
   - name: Iterating over a list
-    debug: 
+    debug:
       msg: >
         Host: {{item}}
     with_items: >
@@ -24,30 +24,30 @@
   name: Run only on first host
   tasks:
   - name: Iterating over a map yields the keys
-    debug: 
+    debug:
       msg: >
         Host: {{item}}
     with_items: >
       {{ hostvars }}
   - name: Use subscript to access entries
-    debug: 
+    debug:
       msg: >
        address: {{ hostvars[item]['ansible_default_ipv4']['address'] }}
     with_items: >
       {{ groups['web'] }}
-    
+
 
 - hosts: web[0]
   tags: filters
   name: Get a list of defined host ips.
   tasks:
 
   - name: Using filters
-    debug: 
+    debug:
       msg: >
-       {{ groups['web'] | 
-          map('extract', hostvars, ['ansible_default_ipv4', 'address']) | 
-          reject('undefined') | 
+       {{ groups['web'] |
+          map('extract', hostvars, ['ansible_default_ipv4', 'address']) |
+          reject('undefined') |
           list }}
 
 
diff --git a/python-for-sysadmin/requirements.txt b/python-for-sysadmin/requirements.txt
@@ -13,6 +13,9 @@ ansible
 docker-py
 pyyaml
 
+# jupyter tools
+nbstripout
+
 # Load jupyter extensions for exercises.
 jupyter_contrib_nbextensions
 RISE
