matching RHPDS to master branch of github.com/ansible/workshops (#1690)

- changing networking to network to match workshop scaffolding and reduce complexity - adding RHEL 90 workshop (shortened version of workshop) see release PR here: ansible/workshops#819 . this is not merged yet, trying to coordinate RHPDS with master branch changes that affect RHPDS Co-authored-by: Tony Kay <ankay@redhat.com>
redhat-cop · May 6, 2020 · b8b8aa9 · b8b8aa9
1 parent 564fd59
commit b8b8aa9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/ansible/configs/ansible-workshops/vars/networking_arista_tower_workshop_vars.yml b/ansible/configs/ansible-workshops/vars/networking_arista_tower_workshop_vars.yml
@@ -3,6 +3,6 @@
 
 autolicense:          true
 towerinstall:         true
-workshop_type:        networking
+workshop_type:        network
 network_type:         arista
 ...
diff --git a/ansible/configs/ansible-workshops/vars/networking_cisco_tower_workshop_vars.yml b/ansible/configs/ansible-workshops/vars/networking_cisco_tower_workshop_vars.yml
@@ -3,6 +3,6 @@
 
 autolicense:          true
 towerinstall:         true
-workshop_type:        networking
+workshop_type:        network
 network_type:         cisco
 ...
diff --git a/ansible/configs/ansible-workshops/vars/networking_juniper_tower_workshop_vars.yml b/ansible/configs/ansible-workshops/vars/networking_juniper_tower_workshop_vars.yml
@@ -3,6 +3,6 @@
 
 autolicense:          true
 towerinstall:         true
-workshop_type:        networking
+workshop_type:        network
 network_type:         juniper
 ...
diff --git a/ansible/configs/ansible-workshops/vars/networking_multivendor_tower_workshop_vars.yml b/ansible/configs/ansible-workshops/vars/networking_multivendor_tower_workshop_vars.yml
@@ -3,6 +3,6 @@
 
 autolicense:          true
 towerinstall:         true
-workshop_type:        networking
+workshop_type:        network
 #network_type:         multivendor
 ...
diff --git a/ansible/configs/ansible-workshops/vars/rhel_90_tower_workshop_vars.yml b/ansible/configs/ansible-workshops/vars/rhel_90_tower_workshop_vars.yml
@@ -0,0 +1,7 @@
+---
+# 2020-03-10 Ansible Workshop RHEL with Tower
+
+autolicense:          true
+towerinstall:         true                  # Installs latest Tower
+workshop_type:        rhel_90
+...
diff --git a/ansible/configs/ansible-workshops/vars/rhel_tower_workshop_vars.yml b/ansible/configs/ansible-workshops/vars/rhel_tower_workshop_vars.yml
@@ -2,6 +2,6 @@
 # 2020-03-10 Ansible Workshop RHEL with Tower
 
 autolicense:          true
-towerinstall:         true                  # Installs latest Tower 
+towerinstall:         true                  # Installs latest Tower
 workshop_type:        rhel
 ...