Merge pull request #317 from nre-learning/compatibility-0-6-0

Updates for Antidote 0.6.0 Compatibility
nre-learning · Apr 11, 2020 · acb6a6b · acb6a6b
2 parents 7d47f39 + c6ab9d3
commit acb6a6b
Show file tree

Hide file tree

Showing 439 changed files with 1,127 additions and 3,046 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,4 +46,4 @@ __pycache__
 *.img
 *.tgz
 
-!lessons/tools/lesson-41-ansible-network/stage1/hosts
+!lessons/ansible-network-automation/stage0/hosts
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,8 @@ notifications:
 services:
   - docker
 before_install:
-  - docker pull antidotelabs/syringe:latest
-  - docker run -v $(pwd):/antidote antidotelabs/syringe syrctl validate /antidote
+  - docker pull antidotelabs/antidote-core:latest
+  - docker run -v $(pwd):/antidote antidotelabs/antidote-core antidote validate /antidote
 install:
   - ./check-changelog.sh
 sudo: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## In development
 
+- Updates for 0.6.0 Compatibility [#317](https://github.com/nre-learning/nrelabs-curriculum/pull/317)
 
 ## v1.1.2 - April 06, 2020
 

diff --git a/README.md b/README.md
@@ -2,9 +2,6 @@
 
 [![Build Status](https://travis-ci.org/nre-learning/nrelabs-curriculum.svg?branch=master)](https://travis-ci.org/nre-learning/nrelabs-curriculum)
 
-This repository houses the curriculum for [NRE Labs](https://labs.networkreliability.engineering), a site for
-teaching network automation in the browser using real, interactive, compelling virtual environments.
+This repository houses the curriculum for [NRE Labs](https://nrelabs.io), a site for teaching next-generation network engineering skills in the browser powered by on-demand, interactive virtual environments, and compelling real-world scenarios.
 
-It's powered by the [Antidote](https://github.com/nre-learning/antidote) project, which provides a platform for representing curriculum-as-code, meaning all learning materials can be represented as simple text files, stored in a Git repo. This repo houses exactly that - all of the learning materials for the NRE Labs curriculum.
-
-Contributions of all kinds to this curriculum are not only welcome, but encouraged! Please first read the [contribution guide](https://antidoteproject.readthedocs.io/en/latest/contribute-nrelabs/index.html) for information on not only how to contribute, but some of the key ideas and philosophies behind the curriculum.
+If you are interested in contributing to this curriculum - great! We would love to have you. Head on over to the [contribution guide](https://docs.nrelabs.io/creating-contributing/getting-started) to get started.
diff --git a/collections/cisco/collection.meta.yaml b/collections/cisco/collection.meta.yaml
diff --git a/collections/cumulus/collection.meta.yaml → ...ons/cumulus-networks/collection.meta.yaml b/collections/cumulus/collection.meta.yaml → ...ons/cumulus-networks/collection.meta.yaml
@@ -1,5 +1,5 @@
 ---
-id: 8
+slug: cumulus-networks
 title: Cumulus Networks
 image: https://raw.githubusercontent.com/nre-learning/nrelabs-curriculum/v1.1.1/collections/cumulus/cumulus.png
 website: https://cumulusnetworks.com

diff --git a/collections/cumulus/cumulus.png → collections/cumulus-networks/cumulus.png b/collections/cumulus/cumulus.png → collections/cumulus-networks/cumulus.png
diff --git a/collections/gdt/collection.meta.yaml b/collections/gdt/collection.meta.yaml
diff --git a/collections/gdt/gdt.jpg b/collections/gdt/gdt.jpg
diff --git a/collections/hexabuild/collection.meta.yaml b/collections/hexabuild/collection.meta.yaml
diff --git a/collections/hexabuild/hexabuild.png b/collections/hexabuild/hexabuild.png
diff --git a/collections/ignw/collection.meta.yaml b/collections/ignw/collection.meta.yaml
diff --git a/collections/ignw/ignw.png b/collections/ignw/ignw.png
diff --git a/collections/juniper/collection.meta.yaml → ...ons/juniper-networks/collection.meta.yaml b/collections/juniper/collection.meta.yaml → ...ons/juniper-networks/collection.meta.yaml
@@ -1,5 +1,5 @@
 ---
-id: 1
+slug: juniper-networks
 title: Juniper Networks
 image: https://raw.githubusercontent.com/nre-learning/nrelabs-curriculum/v1.1.1/collections/juniper/juniper.png
 website: https://learningportal.juniper.net/juniper/user_activity_info.aspx?id=10275

diff --git a/collections/juniper/juniper.png → collections/juniper-networks/juniper.png b/collections/juniper/juniper.png → collections/juniper-networks/juniper.png
diff --git a/collections/myriad/collection.meta.yaml b/collections/myriad/collection.meta.yaml
diff --git a/collections/myriad/myriad.jpeg b/collections/myriad/myriad.jpeg
diff --git a/collections/ntc/collection.meta.yaml → ...ions/network-to-code/collection.meta.yaml b/collections/ntc/collection.meta.yaml → ...ions/network-to-code/collection.meta.yaml
@@ -1,5 +1,5 @@
 ---
-id: 10
+slug: network-to-code
 title: Network To Code
 image: https://raw.githubusercontent.com/nre-learning/nrelabs-curriculum/v1.1.1/collections/ntc/ntc.png
 website: https://www.networktocode.com/

diff --git a/collections/ntc/ntc.png → collections/network-to-code/ntc.png b/collections/ntc/ntc.png → collections/network-to-code/ntc.png
diff --git a/...ctions/packetpushers/collection.meta.yaml → ...tions/packet-pushers/collection.meta.yaml b/...ctions/packetpushers/collection.meta.yaml → ...tions/packet-pushers/collection.meta.yaml
@@ -1,5 +1,5 @@
 ---
-id: 9
+slug: packet-pushers
 title: Packet Pushers
 image: https://raw.githubusercontent.com/nre-learning/nrelabs-curriculum/v1.1.1/collections/packetpushers/pp.jpg
 website: https://packetpushers.net/

diff --git a/collections/packetpushers/pp.jpg → collections/packet-pushers/pp.jpg b/collections/packetpushers/pp.jpg → collections/packet-pushers/pp.jpg
diff --git a/collections/redhat/collection.meta.yaml → collections/red-hat/collection.meta.yaml b/collections/redhat/collection.meta.yaml → collections/red-hat/collection.meta.yaml
@@ -1,5 +1,5 @@
 ---
-id: 7
+slug: red-hat
 title: Red Hat
 image: https://raw.githubusercontent.com/nre-learning/nrelabs-curriculum/v1.1.1/collections/redhat/redhat.jpg
 website: https://www.redhat.com

diff --git a/collections/redhat/redhat.jpg → collections/red-hat/redhat.jpg b/collections/redhat/redhat.jpg → collections/red-hat/redhat.jpg
diff --git a/collections/synercomm/collection.meta.yaml b/collections/synercomm/collection.meta.yaml
diff --git a/collections/synercomm/synercomm.png b/collections/synercomm/synercomm.png
diff --git a/collections/twinbridges/collection.meta.yaml → ...ections/twin-bridges/collection.meta.yaml b/collections/twinbridges/collection.meta.yaml → ...ections/twin-bridges/collection.meta.yaml
@@ -1,5 +1,5 @@
 ---
-id: 11
+slug: twin-bridges
 title: Twin Bridges Technology
 image: https://raw.githubusercontent.com/nre-learning/nrelabs-curriculum/v1.1.1/collections/twinbridges/twinbridges.png
 website: https://pynet.twb-tech.com/

diff --git a/collections/twinbridges/twinbridges.png → collections/twin-bridges/twinbridges.png b/collections/twinbridges/twinbridges.png → collections/twin-bridges/twinbridges.png
diff --git a/curriculum.meta.yaml b/curriculum.meta.yaml
@@ -0,0 +1,5 @@
+name: nrelabs
+description: Learn next-generation network engineering skills in the browser, for free
+website: https://nrelabs.io
+aVer: 0.6.0
+gitRoot: https://github.com/nre-learning/nrelabs-curriculum
diff --git a/images/ansible/image.meta.yaml b/images/ansible/image.meta.yaml
@@ -0,0 +1,11 @@
+slug: ansible
+description: ansible
+privileged: false
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+
+
diff --git a/images/asterisk/image.meta.yaml b/images/asterisk/image.meta.yaml
@@ -0,0 +1,11 @@
+slug: asterisk
+description: asterisk
+privileged: true
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+
+
diff --git a/images/cvx/image.meta.yaml b/images/cvx/image.meta.yaml
@@ -0,0 +1,13 @@
+slug: cvx
+description: Cumulus Linux
+privileged: true
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+  - 'eth1'
+  - 'eth2'
+  - 'eth3'
+
diff --git a/images/pjsua-lindsey/image.meta.yaml b/images/pjsua-lindsey/image.meta.yaml
@@ -0,0 +1,10 @@
+slug: pjsua-lindsey
+description: SIP phone
+privileged: true
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+
diff --git a/images/salt/image.meta.yaml b/images/salt/image.meta.yaml
@@ -0,0 +1,10 @@
+slug: salt
+description: salt
+privileged: false
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+
diff --git a/images/selfservice-flask-app/sample_app/__init__.py b/images/selfservice-flask-app/sample_app/__init__.py
@@ -28,7 +28,7 @@ def create_app(configfile=None):
     # http://flask.pocoo.org/docs/patterns/appfactories/
 
 
-    APPLICATION_ROOT = '/%s' % os.environ['SYRINGE_FULL_REF']
+    APPLICATION_ROOT = '/%s' % os.environ['ANTIDOTE_FULL_REF']
 
     app = Flask(__name__)
 

diff --git a/images/selfservice-flask-app/sample_application/__init__.py b/images/selfservice-flask-app/sample_application/__init__.py
@@ -54,10 +54,10 @@ class SelfServiceForm(Form):
 
 def create_app(configfile=None):
 
-    APPLICATION_ROOT = '/%s' % os.environ['SYRINGE_FULL_REF']
+    APPLICATION_ROOT = '/%s' % os.environ['ANTIDOTE_FULL_REF']
 
     app = Flask(__name__)
-    app.config['APPLICATION_ROOT'] = '/%s' % os.environ['SYRINGE_FULL_REF']
+    app.config['APPLICATION_ROOT'] = '/%s' % os.environ['ANTIDOTE_FULL_REF']
 
     AppConfig(app, configfile)  # Flask-Appconfig is not necessary, but
                                 # highly recommend =)

diff --git a/images/st2/.welcome.sh → images/stackstorm/.welcome.sh b/images/st2/.welcome.sh → images/stackstorm/.welcome.sh
diff --git a/images/st2/Dockerfile → images/stackstorm/Dockerfile b/images/st2/Dockerfile → images/stackstorm/Dockerfile
diff --git a/images/st2/Makefile → images/stackstorm/Makefile b/images/st2/Makefile → images/stackstorm/Makefile
diff --git a/images/st2/htpasswd → images/stackstorm/htpasswd b/images/st2/htpasswd → images/stackstorm/htpasswd
diff --git a/images/stackstorm/image.meta.yaml b/images/stackstorm/image.meta.yaml
@@ -0,0 +1,10 @@
+slug: stackstorm
+description: stackstorm
+privileged: false
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+
diff --git a/images/st2/napalm.yaml → images/stackstorm/napalm.yaml b/images/st2/napalm.yaml → images/stackstorm/napalm.yaml
diff --git a/images/st2/st2config → images/stackstorm/st2config b/images/st2/st2config → images/stackstorm/st2config
diff --git a/images/st2/start_st2_services.sh → images/stackstorm/start_st2_services.sh b/images/st2/start_st2_services.sh → images/stackstorm/start_st2_services.sh
diff --git a/images/terraform/image.meta.yaml b/images/terraform/image.meta.yaml
@@ -0,0 +1,10 @@
+slug: terraform
+description: terraform
+privileged: false
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+
diff --git a/images/utility/image.meta.yaml b/images/utility/image.meta.yaml
@@ -0,0 +1,12 @@
+slug: utility
+description: Utility image
+privileged: false
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'eth0'
+  - 'eth1'
+  - 'eth2'
+  - 'eth3'
diff --git a/images/vqfx/Dockerfile-snap1 → images/vqfx-snap1/Dockerfile b/images/vqfx/Dockerfile-snap1 → images/vqfx-snap1/Dockerfile
diff --git a/images/vqfx/README.md → images/vqfx-snap1/README.md b/images/vqfx/README.md → images/vqfx-snap1/README.md
diff --git a/images/vqfx-snap1/image.meta.yaml b/images/vqfx-snap1/image.meta.yaml
@@ -0,0 +1,13 @@
+slug: vqfx-snap1
+description: vqfx
+privileged: true
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'em0'
+  - 'em3'
+  - 'em4'
+  - 'em5'
+  - 'em6'
diff --git a/images/vqfx/launch.sh → images/vqfx-snap1/launch.sh b/images/vqfx/launch.sh → images/vqfx-snap1/launch.sh
diff --git a/images/vqfx/Dockerfile-snap2 → images/vqfx-snap2/Dockerfile b/images/vqfx/Dockerfile-snap2 → images/vqfx-snap2/Dockerfile
diff --git a/images/vqfx-snap2/image.meta.yaml b/images/vqfx-snap2/image.meta.yaml
@@ -0,0 +1,13 @@
+slug: vqfx-snap2
+description: vqfx
+privileged: true
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'em0'
+  - 'em3'
+  - 'em4'
+  - 'em5'
+  - 'em6'
diff --git a/images/vqfx/Dockerfile-snap3 → images/vqfx-snap3/Dockerfile b/images/vqfx/Dockerfile-snap3 → images/vqfx-snap3/Dockerfile
diff --git a/images/vqfx-snap3/image.meta.yaml b/images/vqfx-snap3/image.meta.yaml
@@ -0,0 +1,13 @@
+slug: vqfx-snap3
+description: vqfx
+privileged: true
+sshUser: antidote
+sshPassword: antidotepassword
+configUser: antidote
+configPassword: antidotepassword
+networkInterfaces:
+  - 'em0'
+  - 'em3'
+  - 'em4'
+  - 'em5'
+  - 'em6'
diff --git a/images/vqfx/Dockerfile b/images/vqfx/Dockerfile
diff --git a/images/vqfx/push.sh b/images/vqfx/push.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,4 +46,4 @@ __pycache__ @@
     *.img
     *.tgz
-    !lessons/tools/lesson-41-ansible-network/stage1/hosts
+    !lessons/ansible-network-automation/stage0/hosts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@

		## In development

		- Updates for 0.6.0 Compatibility [#317](https://github.com/nre-learning/nrelabs-curriculum/pull/317)

		## v1.1.2 - April 06, 2020

Expand Down