diff --git a/common/container-puppet.sh b/common/container-puppet.sh index e5eb6e5d46..b991b47a49 100644 --- a/common/container-puppet.sh +++ b/common/container-puppet.sh @@ -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 diff --git a/deployment/containers-common.yaml b/deployment/containers-common.yaml index a225300e1a..119e1aafb2 100644 --- a/deployment/containers-common.yaml +++ b/deployment/containers-common.yaml @@ -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 \