From 0ae072e1ad7ed6a454242b6ffcdbb8444a71720c Mon Sep 17 00:00:00 2001
From: Jim Gauld <james.gauld@windriver.com>
Date: Tue, 18 Sep 2018 12:53:12 -0400
Subject: [PATCH] Decouple Guest-server/agent from stx-metal

This decouples the build and packaging of guest-server, guest-agent from
mtce, by splitting guest component into stx-nfv repo.

This leaves existing C++ code, scripts, and resource files untouched,
so there is no functional change. Code refactoring is beyond the scope
of this update.

Makefiles were modified to include devel headers directories
/usr/include/mtce-common and /usr/include/mtce-daemon.
This ensures there is no contamination with other system headers.

The cgts-mtce-common package is renamed and split into:
- repo stx-metal: mtce-common, mtce-common-dev
- repo stx-metal: mtce
- repo stx-nfv: mtce-guest
- repo stx-ha: updates package dependencies to mtce-pmon for
  service-mgmt, sm, and sm-api

mtce-common:
- contains common and daemon shared source utility code

mtce-common-dev:
- based on mtce-common, contains devel package required to build
  mtce-guest and mtce
- contains common library archives and headers

mtce:
- contains components: alarm, fsmon, fsync, heartbeat, hostw, hwmon,
  maintenance, mtclog, pmon, public, rmon

mtce-guest:
- contains guest component guest-server, guest-agent

Story: 2002829
Task: 22748

Depends-On: https://review.openstack.org/603435

Change-Id: I1a66c28bfa592d8034074a18e2328f69122da89b
Signed-off-by: Jim Gauld <james.gauld@windriver.com>
---
 service-mgmt-api/centos/sm-api.spec                | 2 +-
 service-mgmt/sm-1.0.0/centos/sm.spec               | 2 +-
 service-mgmt/sm-common-1.0.0/centos/sm-common.spec | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service-mgmt-api/centos/sm-api.spec b/service-mgmt-api/centos/sm-api.spec
index 041970ea..1aed9d11 100644
--- a/service-mgmt-api/centos/sm-api.spec
+++ b/service-mgmt-api/centos/sm-api.spec
@@ -21,7 +21,7 @@ Requires: python-libs
 # Needed for /etc/init.d, can be removed when we go fully systemd
 Requires: chkconfig
 # Needed for /etc/pmon.d
-Requires:  cgts-mtce-common-pmon
+Requires:  mtce-pmon
 
 
 %prep
diff --git a/service-mgmt/sm-1.0.0/centos/sm.spec b/service-mgmt/sm-1.0.0/centos/sm.spec
index 778fb1f6..3ca84b5c 100644
--- a/service-mgmt/sm-1.0.0/centos/sm.spec
+++ b/service-mgmt/sm-1.0.0/centos/sm.spec
@@ -31,7 +31,7 @@ Requires(preun): systemd
 # Needed for /etc/init.d, can be removed when we go fully systemd
 Requires: chkconfig
 # Needed for /etc/pmon.d
-Requires:  cgts-mtce-common-pmon
+Requires:  mtce-pmon
 # Needed for /etc/logrotate.d
 Requires: logrotate
 # for collect stuff
diff --git a/service-mgmt/sm-common-1.0.0/centos/sm-common.spec b/service-mgmt/sm-common-1.0.0/centos/sm-common.spec
index f76ecfe0..2bb097a5 100644
--- a/service-mgmt/sm-common-1.0.0/centos/sm-common.spec
+++ b/service-mgmt/sm-common-1.0.0/centos/sm-common.spec
@@ -16,7 +16,7 @@ BuildRequires: gcc
 BuildRequires: util-linux
 BuildRequires: libuuid-devel
 
-Requires: cgts-mtce-common-pmon
+Requires: mtce-pmon
 Requires: /bin/sh
 Requires: sqlite
 Requires: util-linux