From f337448d52a69070e4ebabc0ac6110a732198d3b Mon Sep 17 00:00:00 2001 From: ipvsean Date: Tue, 5 May 2020 10:56:01 -0400 Subject: [PATCH] matching RHPDS to master branch of github.com/ansible/workshops - changing networking to network to match workshop scaffolding and reduce complexity - adding RHEL 90 workshop (shortened version of workshop) see release PR here: https://github.com/ansible/workshops/pull/819 . this is not merged yet, trying to coordinate RHPDS with master branch changes that affect RHPDS --- .../vars/networking_arista_tower_workshop_vars.yml | 2 +- .../vars/networking_cisco_tower_workshop_vars.yml | 2 +- .../vars/networking_juniper_tower_workshop_vars.yml | 2 +- .../vars/networking_multivendor_tower_workshop_vars.yml | 2 +- .../ansible-workshops/vars/rhel_90_tower_workshop_vars.yml | 7 +++++++ .../ansible-workshops/vars/rhel_tower_workshop_vars.yml | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 ansible/configs/ansible-workshops/vars/rhel_90_tower_workshop_vars.yml 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 index 7eed15ffee3..cc1df9eff42 100644 --- 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 index 5e6411f6135..3c1598a35a2 100644 --- 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 index 5ce67925c7e..29d48014fd3 100644 --- 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 index 68318fdbb69..fe4a8dc9ed0 100644 --- 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 new file mode 100644 index 00000000000..c8fe2747205 --- /dev/null +++ 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 index 0364d3f7f9a..6f133b41531 100644 --- 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 ...