Merge "Set facter variable 'uuid' explicitly in docker-puppet.py"

This commit is contained in:
Zuul 2018-12-07 06:18:21 +00:00 committed by Gerrit Code Review
commit fd04035471
2 changed files with 4 additions and 1 deletions

View File

@ -295,6 +295,7 @@ with open(sh_script, 'w') as script_file:
fi
# $::deployment_type in puppet-tripleo
export FACTER_deployment_type=containers
export FACTER_uuid=$(cat /sys/class/dmi/id/product_uuid | tr '[:upper:]' '[:lower:]')
/usr/bin/puppet apply --summarize \
--detailed-exitcodes \
--color=false \

View File

@ -29,7 +29,9 @@ resources:
- name: node_lookup
config: |
#!/bin/sh
node_id=$(dmidecode --s system-uuid | awk 'match($0, /[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}/) { print substr($0, RSTART, RLENGTH) }')
node_id=$(dmidecode --s system-uuid | awk 'match($0, \
/[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}/) \
{ print substr($0, RSTART, RLENGTH) }' | tr '[:upper:]' '[:lower:]')
# Create a /etc/puppet/hieradata/UUID.json file to provide
# the data of the NodeDataLookup parameter that matches the