From 8e1e5fc8584705bc58866c7da66d0acc4f18c48e Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 24 Sep 2019 12:57:38 -0400
Subject: [PATCH] Tiller upgrade prep
Removes references of the armada image name in sysinv.conf. Image
versions will be stored in sysinv/common/image_versions.py.
Depends-On: https://review.opendev.org/684401
Story: 2006590
Task: 36725
Change-Id: I53ca532f87a592310d1a05d0c8c98f72d3bc0f9c
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
---
modules/puppet-sysinv/centos/build_srpm.data | 2 +-
.../src/sysinv/manifests/init.pp | 22 +------------------
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/modules/puppet-sysinv/centos/build_srpm.data b/modules/puppet-sysinv/centos/build_srpm.data
index 76e75eaa9..bd586af82 100644
--- a/modules/puppet-sysinv/centos/build_srpm.data
+++ b/modules/puppet-sysinv/centos/build_srpm.data
@@ -1,2 +1,2 @@
SRC_DIR="src"
-TIS_PATCH_VER=7
+TIS_PATCH_VER=8
diff --git a/modules/puppet-sysinv/src/sysinv/manifests/init.pp b/modules/puppet-sysinv/src/sysinv/manifests/init.pp
index c6de412c3..9727c89c9 100644
--- a/modules/puppet-sysinv/src/sysinv/manifests/init.pp
+++ b/modules/puppet-sysinv/src/sysinv/manifests/init.pp
@@ -1,18 +1,10 @@
#
# Files in this package are licensed under Apache; see LICENSE file.
#
-# Copyright (c) 2013-2018 Wind River Systems, Inc.
+# Copyright (c) 2013-2019 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
-# Aug 2016: rebase mitaka
-# Jun 2016: rebase centos
-# Jun 2015: uprev kilo
-# Dec 2014: uprev juno
-# Jul 2014: rename ironic
-# Dec 2013: uprev grizzly, havana
-# Nov 2013: integrate source from https://github.com/stackforge/puppet-sysinv
-#
#
# == Parameters
@@ -215,16 +207,4 @@ class sysinv (
'filter:authtoken/region_name': value => $region_name;
}
- if $::platform::kubernetes::params::enabled == true {
- if $::platform::docker::params::quay_registry {
- $quay_registry = $::platform::docker::params::quay_registry
- } else {
- $quay_registry = 'quay.io'
- }
-
- $armada_img_tag = "${quay_registry}/airshipit/armada:8a1638098f88d92bf799ef4934abe569789b885e-ubuntu_bionic"
- sysinv_config {
- 'DEFAULT/armada_image_tag': value => $armada_img_tag;
- }
- }
}