2022-September-02 - 2.6+14126

Infra: Clean up use of generate-self-cert toggle (#11018)

We already toggle whether we generate self signed certs
when we include the role. This update cleans up an
extraneous 'when' clause and places the default
value for the toggle with the role that uses it.