Merge "Set facter variable 'uuid' explicitly in docker-puppet.py" into stable/queens

docker/docker-puppet.py

@@ -225,6 +225,7 @@ with open(sh_script, 'w') as script_file:
     set +e
     # $::deployment_type in puppet-tripleo
     export FACTER_deployment_type=containers
+    export FACTER_uuid=$(cat /sys/class/dmi/id/product_uuid | tr '[:upper:]' '[:lower:]')
     FACTER_hostname=$HOSTNAME /usr/bin/puppet apply --summarize \
     --detailed-exitcodes --color=false --logdest syslog --logdest console --modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules $TAGS /etc/config.pp
     rc=$?

puppet/extraconfig/pre_deploy/per_node.yaml

@@ -29,7 +29,7 @@ resources:
       - name: node_lookup
       config: |
         #!/bin/sh
-        node_id=$(dmidecode --s system-uuid)
+        node_id=$(dmidecode --s system-uuid | tr '[:upper:]' '[:lower:]')
 
         # Create a /etc/puppet/hieradata/UUID.json file to provide
         # the data of the NodeDataLookup parameter that matches the