Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions actions/create_vm_role.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ parameters:
- pkg_UBUNTU20
- pkg_RHEL7
- pkg_RHEL8
# TODO: Remove these
# TODO: Remove these - seem to be referenced in upgrade workflow
- pkg_CENTOS7
- pkg_CENTOS8
# TODO: Remove this
- ubuntu
# TODO: Remove these
- centos7
- centos8
- pkg_ROCKY8
6 changes: 3 additions & 3 deletions actions/set_hostname_cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
# Keep these though
- "UBUNTU18"
- "UBUNTU20"
# TODO: Remove these
# TODO: Remove these - but appear to be used in upgrade workflow
- "pkg_CENTOS7"
- "pkg_CENTOS8"
- "pkg_ROCKY8"
# Keep these though
- "pkg_RHEL7"
- "pkg_RHEL8"
- "pkg_UBUNTU18"
- "pkg_UBUNTU20"
cmd:
immutable: true
default: '{% if distro in ["RHEL7","RHEL8","pkg_CENTOS7","pkg_CENTOS8","pkg_RHEL7","pkg_RHEL8"] -%}{{redhat}}{% elif distro in ["pkg_UBUNTU18","UBUNTU18","pkg_UBUNTU20","UBUNTU20"] -%}{{ubuntu}}{% elif distro in ["F20","F21"] -%}{{fedora}}{% endif -%}'
default: '{% if distro in ["RHEL7","RHEL8","pkg_CENTOS7","pkg_ROCKY8","pkg_RHEL7","pkg_RHEL8"] -%}{{redhat}}{% elif distro in ["pkg_UBUNTU18","UBUNTU18","pkg_UBUNTU20","UBUNTU20"] -%}{{ubuntu}}{% elif distro in ["F20","F21"] -%}{{fedora}}{% endif -%}'
redhat:
type: "string"
immutable: true
Expand Down