From 4cbac12082f128039199b9613404a0983f4686bd Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Wed, 4 Oct 2017 10:22:28 +0200
Subject: [PATCH] Remove hiera hook transition from the upgradeinitcommand.

This is only valid for Netwon to Ocata upgrade.

Change-Id: I57dba7e004455b260d4c862bd6399d8f2848bcd8
---
 environments/major-upgrade-composable-steps.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/environments/major-upgrade-composable-steps.yaml b/environments/major-upgrade-composable-steps.yaml
index 0dbb6cdae9..84e83ae92d 100644
--- a/environments/major-upgrade-composable-steps.yaml
+++ b/environments/major-upgrade-composable-steps.yaml
@@ -6,14 +6,9 @@ parameter_defaults:
   UpgradeLevelNovaCompute: auto
   UpgradeInitCommonCommand: |
     #!/bin/bash
-    # Newton to Ocata, we need to remove old hiera hook data and
-    # install ansible heat agents and ansible-pacemaker
     set -eu
     yum install -y python-heat-agent-*
     yum update -y ansible
     yum install -y ansible-pacemaker
-    rm -f /usr/libexec/os-apply-config/templates/etc/puppet/hiera.yaml
-    rm -f /usr/libexec/os-refresh-config/configure.d/40-hiera-datafiles
-    rm -f /etc/puppet/hieradata/*.yaml
   MigrationSshPort: 22
   UpgradeRemoveUnusedPackages: false