Drop unnecessary tripleo_ prefix from skeleton role

This patch updates the skeleton role to not add the unnecessary
"tripleo_" prefix when a role name already starts with "tripleo-".

Also updates the generated roles that were affected by this change.

Change-Id: Ib1f604a098cc5d7e8c1a5aa5fe2c8e339e263c91
changes/51/690151/3
James Slagle 3 years ago
parent bc6ccf2240
commit 2424c6d4a9
  1. 4
      _skeleton_role_/defaults/main.yml.j2
  2. 2
      _skeleton_role_/vars/main.yml
  3. 2
      tripleo_ansible/roles/tripleo-container-image-prepare/defaults/main.yml
  4. 2
      tripleo_ansible/roles/tripleo-sshd/defaults/main.yml

@ -17,6 +17,6 @@
# All variables intended for modification should be placed in this file.
# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('-', '_') }}"
tripleo_{{ role_name | replace('-', '_') }}_debug: false
# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}"
tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}_debug: false

@ -19,4 +19,4 @@
# vars, items within this path are considered part of the role and not
# intended to be modified.
# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('-', '_') }}"
# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}"

@ -17,7 +17,7 @@
# All variables intended for modification should be placed in this file.
# All variables within this role should have a prefix of "tripleo_tripleo_container_image_prepare"
# All variables within this role should have a prefix of "tripleo_container_image_prepare"
tripleo_container_image_prepare_debug: false
tripleo_container_image_prepare_content: {}
tripleo_container_image_prepare_roles: []

@ -17,7 +17,7 @@
# All variables intended for modification should be placed in this file.
# All variables within this role should have a prefix of "tripleo_tripleo_sshd"
# All variables within this role should have a prefix of "tripleo_sshd"
# Mapping of sshd_config values
# Package state for ssh

Loading…
Cancel
Save