CB-26607 Do not install metering rpm (v1)

hortonworks · Jul 26, 2024 · 2f6ef18 · 2f6ef18
1 parent 832bf87
commit 2f6ef18
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 55 deletions.
diff --git a/Makefile b/Makefile
@@ -103,8 +103,6 @@ DOCKER_REPO_PASSWORD ?= ""
 # This needs to be changed if there is a version change in fluent components. See usage in the salt files in the Cloudbreak repo.
 # Deprecated: do not increase it anymore, but it can be removed only if no images in use with date before this line is committed.
 FLUENT_PREWARM_TAG ?= "fluent_prewarmed_v5"
-# This needs to be changed if there is a version change in metering heartbeat component. See usage in the salt files in the Cloudbreak repo.
-METERING_PREWARM_TAG ?= "metering_prewarmed_v3"
 # This needs to be changed if there is a version change in cdp-telemetry cli component. See usage in the salt files in the Cloudbreak repo.
 # Deprecated: do not increase it anymore, but it can be removed only if no images in use with date before this line is committed.
 CDP_TELEMETRY_PREWARM_TAG ?= "cdp_telemetry_prewarmed_v12"
@@ -147,7 +145,6 @@ endif
 TAG_CUSTOMER_DELIVERED ?= "No"
 INCLUDE_FLUENT ?= "Yes"
 INCLUDE_CDP_TELEMETRY ?= "Yes"
-INCLUDE_METERING ?= "Yes"
 USE_TELEMETRY_ARCHIVE ?= "Yes"
 ARCHIVE_BASE_URL ?= "https://archive.cloudera.com"
 ARCHIVE_CREDENTIALS ?= ":"
@@ -158,9 +155,6 @@ CDP_LOGGING_AGENT_VERSION ?= ""
 # This one is OS-independent (right?)
 DEFAULT_JUMPGATE_AGENT_RPM_URL := https://archive.cloudera.com/ccm/3.0.9/jumpgate-agent.rpm
 
-# This one is OS-independent (v2.0 is a rewrite done in GoLang)
-DEFAULT_METERING_AGENT_RPM_URL := "https://archive.cloudera.com/cp_clients/thunderhead-metering-heartbeat-application-2.0.0-b12639.x86_64.rpm"
-
 # This one is theoretically OS-dependent and will be overridden in packer.sh for RHEL8, even though apparently packages work regardless of the OS.
 DEFAULT_FREEIPA_PLUGIN_RPM_URL := "https://archive.cloudera.com/cdp-freeipa-artifacts/cdp-hashed-pwd-1.1-b847.el7.x86_64.rpm"
 
@@ -170,7 +164,7 @@ DEFAULT_FREEIPA_HEALTH_AGENT_RPM_URL := "https://archive.cloudera.com/cdp-freeip
 # This one is OS-independent
 DEFAULT_FREEIPA_LDAP_AGENT_RPM_URL := "https://archive.cloudera.com/cdp-freeipa-artifacts/freeipa-ldap-agent-1.0.0-b12478.x86_64.rpm"
 
-ENVS=METADATA_FILENAME_POSTFIX=$(METADATA_FILENAME_POSTFIX) DESCRIPTION=$(DESCRIPTION) STACK_TYPE=$(STACK_TYPE) MPACK_URLS=$(MPACK_URLS) HDP_VERSION=$(HDP_VERSION) BASE_NAME=$(BASE_NAME) IMAGE_NAME=$(IMAGE_NAME) IMAGE_SIZE=$(IMAGE_SIZE) INCLUDE_CDP_TELEMETRY=$(INCLUDE_CDP_TELEMETRY) INCLUDE_FLUENT=$(INCLUDE_FLUENT) INCLUDE_METERING=$(INCLUDE_METERING) USE_TELEMETRY_ARCHIVE=$(USE_TELEMETRY_ARCHIVE) ARCHIVE_BASE_URL=$(ARCHIVE_BASE_URL) ARCHIVE_CREDENTIALS=$(ARCHIVE_CREDENTIALS) ENABLE_POSTPROCESSORS=$(ENABLE_POSTPROCESSORS) CUSTOM_IMAGE_TYPE=$(CUSTOM_IMAGE_TYPE) OPTIONAL_STATES=$(OPTIONAL_STATES) PREINSTALLED_JAVA_HOME=${PREINSTALLED_JAVA_HOME} IMAGE_OWNER=${IMAGE_OWNER} REPOSITORY_TYPE=${REPOSITORY_TYPE} PACKAGE_VERSIONS=$(PACKAGE_VERSIONS) SALT_VERSION=$(SALT_VERSION) SALT_PATH=$(SALT_PATH) PYZMQ_VERSION=$(PYZMQ_VERSION) PYTHON_APT_VERSION=$(PYTHON_APT_VERSION) AWS_MAX_ATTEMPTS=$(AWS_MAX_ATTEMPTS) TRACE=1 AWS_SNAPSHOT_GROUPS=$(AWS_SNAPSHOT_GROUPS) AWS_SNAPSHOT_USER=$(AWS_SNAPSHOT_USER) AWS_AMI_GROUPS=$(AWS_AMI_GROUPS) AWS_AMI_ORG_ARN=$(AWS_AMI_ORG_ARN) TAG_CUSTOMER_DELIVERED=$(TAG_CUSTOMER_DELIVERED) VERSION=$(VERSION) PARCELS_NAME=$(PARCELS_NAME) PARCELS_ROOT=$(PARCELS_ROOT) SUBNET_ID=$(SUBNET_ID) VPC_ID=$(VPC_ID) VIRTUAL_NETWORK_RESOURCE_GROUP_NAME=$(VIRTUAL_NETWORK_RESOURCE_GROUP_NAME) ARM_BUILD_REGION=$(ARM_BUILD_REGION) PRE_WARM_PARCELS=$(PRE_WARM_PARCELS) PRE_WARM_CSD=$(PRE_WARM_CSD) SLES_REGISTRATION_CODE=$(SLES_REGISTRATION_CODE) FLUENT_PREWARM_TAG=$(FLUENT_PREWARM_TAG) METERING_PREWARM_TAG=$(METERING_PREWARM_TAG) CDP_TELEMETRY_PREWARM_TAG=$(CDP_TELEMETRY_PREWARM_TAG) PREWARM_TAG=$(PREWARM_TAG) DEFAULT_JUMPGATE_AGENT_RPM_URL=$(DEFAULT_JUMPGATE_AGENT_RPM_URL) DEFAULT_METERING_AGENT_RPM_URL=$(DEFAULT_METERING_AGENT_RPM_URL) DEFAULT_FREEIPA_PLUGIN_RPM_URL=$(DEFAULT_FREEIPA_PLUGIN_RPM_URL) DEFAULT_FREEIPA_HEALTH_AGENT_RPM_URL=$(DEFAULT_FREEIPA_HEALTH_AGENT_RPM_URL) DEFAULT_FREEIPA_LDAP_AGENT_RPM_URL=$(DEFAULT_FREEIPA_LDAP_AGENT_RPM_URL) CLOUD_PROVIDER=$(CLOUD_PROVIDER) SSH_PUBLIC_KEY="$(SSH_PUBLIC_KEY)" FIPS_MODE=$(FIPS_MODE) STIG_ENABLED=$(STIG_ENABLED)
+ENVS=METADATA_FILENAME_POSTFIX=$(METADATA_FILENAME_POSTFIX) DESCRIPTION=$(DESCRIPTION) STACK_TYPE=$(STACK_TYPE) MPACK_URLS=$(MPACK_URLS) HDP_VERSION=$(HDP_VERSION) BASE_NAME=$(BASE_NAME) IMAGE_NAME=$(IMAGE_NAME) IMAGE_SIZE=$(IMAGE_SIZE) INCLUDE_CDP_TELEMETRY=$(INCLUDE_CDP_TELEMETRY) INCLUDE_FLUENT=$(INCLUDE_FLUENT) USE_TELEMETRY_ARCHIVE=$(USE_TELEMETRY_ARCHIVE) ARCHIVE_BASE_URL=$(ARCHIVE_BASE_URL) ARCHIVE_CREDENTIALS=$(ARCHIVE_CREDENTIALS) ENABLE_POSTPROCESSORS=$(ENABLE_POSTPROCESSORS) CUSTOM_IMAGE_TYPE=$(CUSTOM_IMAGE_TYPE) OPTIONAL_STATES=$(OPTIONAL_STATES) PREINSTALLED_JAVA_HOME=${PREINSTALLED_JAVA_HOME} IMAGE_OWNER=${IMAGE_OWNER} REPOSITORY_TYPE=${REPOSITORY_TYPE} PACKAGE_VERSIONS=$(PACKAGE_VERSIONS) SALT_VERSION=$(SALT_VERSION) SALT_PATH=$(SALT_PATH) PYZMQ_VERSION=$(PYZMQ_VERSION) PYTHON_APT_VERSION=$(PYTHON_APT_VERSION) AWS_MAX_ATTEMPTS=$(AWS_MAX_ATTEMPTS) TRACE=1 AWS_SNAPSHOT_GROUPS=$(AWS_SNAPSHOT_GROUPS) AWS_SNAPSHOT_USER=$(AWS_SNAPSHOT_USER) AWS_AMI_GROUPS=$(AWS_AMI_GROUPS) AWS_AMI_ORG_ARN=$(AWS_AMI_ORG_ARN) TAG_CUSTOMER_DELIVERED=$(TAG_CUSTOMER_DELIVERED) VERSION=$(VERSION) PARCELS_NAME=$(PARCELS_NAME) PARCELS_ROOT=$(PARCELS_ROOT) SUBNET_ID=$(SUBNET_ID) VPC_ID=$(VPC_ID) VIRTUAL_NETWORK_RESOURCE_GROUP_NAME=$(VIRTUAL_NETWORK_RESOURCE_GROUP_NAME) ARM_BUILD_REGION=$(ARM_BUILD_REGION) PRE_WARM_PARCELS=$(PRE_WARM_PARCELS) PRE_WARM_CSD=$(PRE_WARM_CSD) SLES_REGISTRATION_CODE=$(SLES_REGISTRATION_CODE) FLUENT_PREWARM_TAG=$(FLUENT_PREWARM_TAG) CDP_TELEMETRY_PREWARM_TAG=$(CDP_TELEMETRY_PREWARM_TAG) PREWARM_TAG=$(PREWARM_TAG) DEFAULT_JUMPGATE_AGENT_RPM_URL=$(DEFAULT_JUMPGATE_AGENT_RPM_URL) DEFAULT_FREEIPA_PLUGIN_RPM_URL=$(DEFAULT_FREEIPA_PLUGIN_RPM_URL) DEFAULT_FREEIPA_HEALTH_AGENT_RPM_URL=$(DEFAULT_FREEIPA_HEALTH_AGENT_RPM_URL) DEFAULT_FREEIPA_LDAP_AGENT_RPM_URL=$(DEFAULT_FREEIPA_LDAP_AGENT_RPM_URL) CLOUD_PROVIDER=$(CLOUD_PROVIDER) SSH_PUBLIC_KEY="$(SSH_PUBLIC_KEY)" FIPS_MODE=$(FIPS_MODE) STIG_ENABLED=$(STIG_ENABLED)
 
 GITHUB_ORG ?= hortonworks
 GITHUB_REPO ?= cloudbreak-images-metadata

diff --git a/README.image-content.md b/README.image-content.md
@@ -106,7 +106,6 @@ This section provides information about the packages of specified images to be i
 - krb5-kdc (Debian)
 - krb5 (Suse)
 - krb5-client (Suse)
-- metering-heartbeat-rpm (centos, redhat, amazonlinux2)
 - ambari-server
 - ambari-agent
 - mktorrent

diff --git a/docker/redhat8/Dockerfile b/docker/redhat8/Dockerfile
@@ -91,7 +91,6 @@ ENV OS_TYPE=${OS_TYPE}
 
 ARG INCLUDE_FLUENT
 ARG INCLUDE_CDP_TELEMETRY
-ARG INCLUDE_METERING
 ARG CDP_TELEMETRY_RPM_URL
 ARG CDP_LOGGING_AGENT_RPM_URL
 ARG FREEIPA_PLUGIN_RPM_URL
@@ -102,7 +101,6 @@ ARG JUMPGATE_AGENT_GBN
 
 ENV INCLUDE_FLUENT="Yes"
 ENV INCLUDE_CDP_TELEMETRY="Yes"
-ENV INCLUDE_METERING="Yes"
 ENV CDP_TELEMETRY_RPM_URL="https://archive.cloudera.com/cdp-infra-tools/1.3.2/redhat8/yum/cdp_telemetry-1.3.2_b1.rpm"
 ENV CDP_LOGGING_AGENT_RPM_URL="https://archive.cloudera.com/cdp-infra-tools/1.3.2/redhat8/yum/cdp_logging_agent-1.3.2_b1.rpm"
 ENV FREEIPA_PLUGIN_RPM_URL="https://cloudera-build-us-west-1.vpc.cloudera.com/s3/build/49070467/thunderhead/1.x/redhat8/yum/cdp-hashed-pwd-1.0-20240109061814git4230396.el8.x86_64.rpm"

diff --git a/packer.json b/packer.json
@@ -52,8 +52,6 @@
     "prewarm_tag": "{{ env `PREWARM_TAG` }}",
     "include_fluent": "{{ env `INCLUDE_FLUENT` }}",
     "fluent_prewarm_tag": "{{env `FLUENT_PREWARM_TAG` }}",
-    "include_metering": "{{ env `INCLUDE_METERING` }}",
-    "metering_prewarm_tag": "{{env `METERING_PREWARM_TAG` }}",
     "include_cdp_telemetry": "{{ env `INCLUDE_CDP_TELEMETRY` }}",
     "cdp_telemetry_prewarm_tag": "{{env `CDP_TELEMETRY_PREWARM_TAG` }}",
     "use_telemetry_archive": "{{env `USE_TELEMETRY_ARCHIVE` }}",
@@ -110,7 +108,6 @@
     "cdp_logging_agent_rpm_url": "{{ env `CDP_LOGGING_AGENT_RPM_URL` }}",
     "jumpgate_agent_rpm_url": "{{ env `JUMPGATE_AGENT_RPM_URL` }}",
     "jumpgate_agent_gbn": "{{ env `JUMPGATE_AGENT_GBN` }}",
-    "metering_agent_rpm_url": "{{ env `METERING_AGENT_RPM_URL` }}",
     "freeipa_plugin_rpm_url": "{{ env `FREEIPA_PLUGIN_RPM_URL` }}",
     "freeipa_healthagent_rpm_url": "{{ env `FREEIPA_HEALTH_AGENT_RPM_URL` }}",
     "freeipa_ldapagent_rpm_url": "{{ env `FREEIPA_LDAP_AGENT_RPM_URL` }}",
@@ -629,10 +626,8 @@
         "PREWARM_TAG={{user `prewarm_tag` }}",
         "INCLUDE_FLUENT={{user `include_fluent`}}",
         "FLUENT_PREWARM_TAG={{ user `fluent_prewarm_tag` }}",
-        "METERING_PREWARM_TAG={{ user `metering_prewarm_tag` }}",
         "INCLUDE_CDP_TELEMETRY={{user `include_cdp_telemetry`}}",
         "CDP_TELEMETRY_PREWARM_TAG={{ user `cdp_telemetry_prewarm_tag` }}",
-        "INCLUDE_METERING={{user `include_metering`}}",
         "CDP_TELEMETRY_VERSION={{user `cdp_telemetry_version`}}",
         "CDP_TELEMETRY_RPM_URL={{user `cdp_telemetry_rpm_url`}}",
         "CDP_LOGGING_AGENT_VERSION={{user `cdp_logging_agent_version`}}",
@@ -661,7 +656,6 @@
         "PRE_WARM_CSD={{ user `pre_warm_csd` }}",
         "JUMPGATE_AGENT_RPM_URL={{ user `jumpgate_agent_rpm_url` }}",
         "JUMPGATE_AGENT_GBN={{ user `jumpgate_agent_gbn` }}",
-        "METERING_AGENT_RPM_URL={{ user `metering_agent_rpm_url` }}",
         "FREEIPA_PLUGIN_RPM_URL={{ user `freeipa_plugin_rpm_url` }}",
         "FREEIPA_HEALTH_AGENT_RPM_URL={{ user `freeipa_healthagent_rpm_url` }}",
         "FREEIPA_LDAP_AGENT_RPM_URL={{ user `freeipa_ldapagent_rpm_url` }}",

diff --git a/saltstack/final/salt/metadata/tmp/generate-package-versions.sh b/saltstack/final/salt/metadata/tmp/generate-package-versions.sh
@@ -96,15 +96,6 @@ if [[ "$CUSTOM_IMAGE_TYPE" == "freeipa" ]]; then
 		exit 1
 	fi
 elif [[ "$CUSTOM_IMAGE_TYPE" == "hortonworks" ]]; then
-  if [[ -n $METERING_AGENT_RPM_URL ]]; then
-    METERING_REGEX=".*\/[_a-z\-]*\-(.*)\-.*\.x86_64\.rpm"
-    if [[ $METERING_AGENT_RPM_URL =~ $METERING_REGEX ]]; then
-      cat /tmp/package-versions.json | jq --arg metering_agent_version ${BASH_REMATCH[1]} '. + {"metering_agent": $metering_agent_version}' > /tmp/package-versions.json.tmp && mv /tmp/package-versions.json.tmp /tmp/package-versions.json
-    else
-      echo "It is not possible to retrieve the version of Metering Agent from the specified url."
-      exit 1
-    fi
-  fi
 
 	if [ -n "$STACK_VERSION" ] && [ $(version $STACK_VERSION) -lt $(version "7.2.15") ]; then
 		echo "Skip java versions as CB should not allow to force java version before 7.2.15"

diff --git a/saltstack/hortonworks/salt/metering/init.sls b/saltstack/hortonworks/salt/metering/init.sls
diff --git a/saltstack/hortonworks/salt/top.sls b/saltstack/hortonworks/salt/top.sls
@@ -9,6 +9,3 @@ hortonworks:
     - kerberos
     - java
     - pre-warm
-{% if salt['environ.get']('INCLUDE_METERING') == 'Yes' %}
-    - metering
-{% endif %}
diff --git a/scripts/packer.sh b/scripts/packer.sh
@@ -60,7 +60,6 @@ packer_in_container() {
     export INCLUDE_FLUENT=No
     export USE_TELEMETRY_ARCHIVE=No
     export DEFAULT_JUMPGATE_AGENT_RPM_URL=""
-    export DEFAULT_METERING_AGENT_RPM_URL=""
   fi
 
   if [[ "$INCLUDE_CDP_TELEMETRY" == "Yes" && -z "$CDP_TELEMETRY_RPM_URL" ]]; then
@@ -105,9 +104,6 @@ packer_in_container() {
     JUMPGATE_AGENT_GBN=$(curl -Ls "https://release.infra.cloudera.com/hwre-api/latestcompiledbuild?stack=JUMPGATE&release=$JUMPGATE_AGENT_VERSION" --fail | jq -r '.gbn')
   fi
 
-  if ! [[ $METERING_AGENT_RPM_URL =~ ^http.*rpm$ ]]; then
-    export METERING_AGENT_RPM_URL=$DEFAULT_METERING_AGENT_RPM_URL
-  fi
   if ! [[ $FREEIPA_PLUGIN_RPM_URL =~ ^http.*rpm$ ]]; then
     # The RHEL8 version is not backward-compatible, so we have to override the default CentOS 7 version.
     if [[ "$OS" == "redhat8" ]]; then
@@ -199,9 +195,7 @@ packer_in_container() {
     -e INCLUDE_FLUENT=$INCLUDE_FLUENT \
     -e INCLUDE_CDP_TELEMETRY=$INCLUDE_CDP_TELEMETRY \
     -e FLUENT_PREWARM_TAG=$FLUENT_PREWARM_TAG \
-    -e METERING_PREWARM_TAG=$METERING_PREWARM_TAG \
     -e CDP_TELEMETRY_PREWARM_TAG=$CDP_TELEMETRY_PREWARM_TAG \
-    -e INCLUDE_METERING=$INCLUDE_METERING \
     -e USE_TELEMETRY_ARCHIVE=$USE_TELEMETRY_ARCHIVE \
     -e ARCHIVE_BASE_URL=$ARCHIVE_BASE_URL \
     -e ARCHIVE_CREDENTIALS=$ARCHIVE_CREDENTIALS \
@@ -254,7 +248,6 @@ packer_in_container() {
     -e CDP_LOGGING_AGENT_RPM_URL="$CDP_LOGGING_AGENT_RPM_URL" \
     -e JUMPGATE_AGENT_RPM_URL="$JUMPGATE_AGENT_RPM_URL" \
     -e JUMPGATE_AGENT_GBN="$JUMPGATE_AGENT_GBN" \
-    -e METERING_AGENT_RPM_URL="$METERING_AGENT_RPM_URL" \
     -e FREEIPA_PLUGIN_RPM_URL="$FREEIPA_PLUGIN_RPM_URL" \
     -e FREEIPA_HEALTH_AGENT_RPM_URL="$FREEIPA_HEALTH_AGENT_RPM_URL" \
     -e FREEIPA_LDAP_AGENT_RPM_URL="$FREEIPA_LDAP_AGENT_RPM_URL" \

diff --git a/scripts/salt-setup.sh b/scripts/salt-setup.sh
@@ -93,12 +93,6 @@ function add_prewarmed_roles {
     echo "Adding ${prewarmed} to the list of roles for the final image"
     add_single_role_for_cluster_salt ${prewarmed}
   fi
-
-  if [ "${CUSTOM_IMAGE_TYPE}" == "hortonworks" ]; then
-    local metering_prewarmed=${METERING_PREWARM_TAG}
-    echo "Adding ${metering_prewarmed} to the list of roles for the final image"
-    add_single_role_for_cluster_salt ${metering_prewarmed}
-  fi
 }
 
 : ${CUSTOM_IMAGE_TYPE:=$1}