From 607bfe8557cf18efbe1412d55f5509f00073638e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 22 Sep 2022 14:28:26 +0900
Subject: [PATCH] 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
---
 common/container-puppet.sh        | 2 --
 deployment/containers-common.yaml | 2 --
 2 files changed, 4 deletions(-)

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 \