Stop injecting deployment_type fact
... because it is no loner used by puppet-tripleo. Depends-on: https://review.opendev.org/858848 Depends-on: https://review.opendev.org/858839 Depends-on: https://review.opendev.org/858852 Change-Id: I73588ae7c7b96182bc46806747ad47dc1ea7184e
This commit is contained in:
parent
ad6bc22f21
commit
607bfe8557
|
@ -51,8 +51,6 @@ set +e
|
|||
if [ "$NET_HOST" == "false" ]; then
|
||||
export FACTER_hostname=$HOSTNAME
|
||||
fi
|
||||
# $::deployment_type in puppet-tripleo
|
||||
export FACTER_deployment_type=containers
|
||||
export FACTER_uuid=$(cat /sys/class/dmi/id/product_uuid | tr '[:upper:]' '[:lower:]')
|
||||
echo 'Running puppet'
|
||||
# FIXME(bogdando): stdout may be falling behind of the logged syslog messages
|
||||
|
|
|
@ -70,8 +70,6 @@ outputs:
|
|||
cp -a /tmp/puppet-etc/* /etc/puppet || true
|
||||
fi
|
||||
echo "{\"step\": ${STEP}}" > /etc/puppet/hieradata/docker_puppet.json
|
||||
# $::deployment_type in puppet-tripleo
|
||||
export FACTER_deployment_type=containers
|
||||
set +e
|
||||
puppet apply $EXTRA_ARGS \
|
||||
--verbose \
|
||||
|
|
Loading…
Reference in New Issue