starlingx/metal
Code Issues Proposed changes

Merge "remove cgts- prefix to align with other sub-projects (packages)"

Browse Source
This commit is contained in:
Zuul 2018-10-22 01:25:56 +00:00 committed by Gerrit Code Review
commit 196eb85eba
39 changed files with 227 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bsp-files/filter_out_from_compute
View File

@ -11,9 +11,9 @@ cgcs-dpdk-rt-apps
cgts-client
cgts-client-bash-completion
cgcs-patch-controller
cgts-mtce-control
cgts-mtce-storage
cgts-mtce-common-guestAgent
mtce-control
mtce-storage
mtce-guestAgent
cgtssys
cinder
cinder-api

6
bsp-files/filter_out_from_compute_lowlatency
View File

@ -11,9 +11,9 @@ cgcs-dpdk-apps
cgts-client
cgts-client-bash-completion
cgcs-patch-controller
cgts-mtce-control
cgts-mtce-storage
cgts-mtce-common-guestAgent
mtce-control
mtce-storage
mtce-guestAgent
cgtssys
cinder
cinder-api

6
bsp-files/filter_out_from_controller
View File

@ -18,9 +18,9 @@ cgcs-dpdk-rt-dev
cgcs-dpdk-staticdev
cgcs-dpdk-rt-staticdev
cgcs-dpdk-rt-apps
cgts-mtce-compute
cgts-mtce-storage
cgts-mtce-common-guestServer
mtce-compute
mtce-storage
mtce-guestServer
host-guest-comm
host-guest-comm-dev
nfscheck

2
bsp-files/filter_out_from_smallsystem
View File

@ -1,6 +1,6 @@
cgcs-dpdk-rt
cgcs-dpdk-rt-apps
cgts-mtce-storage
mtce-storage
computeconfig-standalone
kernel-module-openvswitch
platform-util-noncontroller

2
bsp-files/filter_out_from_smallsystem_lowlatency
View File

@ -1,6 +1,6 @@
cgcs-dpdk
cgcs-dpdk-apps
cgts-mtce-storage
mtce-storage
computeconfig-standalone
kernel-module-openvswitch
platform-util-noncontroller

8
bsp-files/filter_out_from_storage
View File

@ -15,10 +15,10 @@ cgcs-dpdk-rt-apps
cgts-client
cgts-client-bash-completion
cgcs-patch-controller
cgts-mtce-compute
cgts-mtce-control
cgts-mtce-common-guestServer
cgts-mtce-common-guestAgent
mtce-compute
mtce-control
mtce-guestServer
mtce-guestAgent
cgtssys
cinder
cinder-api

12
centos_iso_image.inc
View File

@ -9,14 +9,14 @@ mtce-rmon
mtce-hwmon
mtce-hostw
# cgts-mtce-compute
cgts-mtce-compute
# mtce-compute
mtce-compute
# cgts-mtce-control
cgts-mtce-control
# mtce-control
mtce-control
# cgts-mtce-storage
cgts-mtce-storage
# mtce-storage
mtce-storage
# pxe-network-installer
pxe-network-installer

2
mtce-compute/PKG-INFO
View File

@ -1,5 +1,5 @@
Metadata-Version: 1.1
Name: cgts-mtce-compute
Name: mtce-compute
Version: 1.0
Summary: Titanium Cloud Platform Compute Node Maintenance Package
Home-page:

4
mtce-compute/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
SRC_DIR="$PKG_BASE/cgts-mtce-compute-1.0/scripts"
SRC_DIR="$PKG_BASE/src"
COPY_LIST="$SRC_DIR/*"
TIS_PATCH_VER=4
TIS_PATCH_VER=5

94
mtce-compute/centos/cgts-mtce-compute.spec
View File

@ -1,94 +0,0 @@
%define local_etc_pmond %{_sysconfdir}/pmon.d
%define local_etc_goenabledd %{_sysconfdir}/goenabled.d
%define local_etc_nova %{_sysconfdir}/nova
%define debug_package %{nil}
Name: cgts-mtce-compute
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
Summary: Compute Node Maintenance Package
Group: base
License: Apache-2.0
Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: goenabled
Source2: e_nova-init
Source3: nova-cleanup
Source4: nova-startup
Source11: nova-cleanup.conf
Source12: nova-compute.conf
Source14: libvirtd.conf
Source21: nova-goenabled.sh
Source22: virt-support-goenabled.sh
Source31: goenabled-compute.service
Source32: e_nova-init.service
BuildRequires: systemd
BuildRequires: systemd-devel
Requires: bash
Requires: /bin/systemctl
Requires: qemu-kvm-ev
%description
Maintenance support files for compute-only node type
%prep
%setup
%build
%install
# Compute-Only Init Scripts (source group x)
install -m 755 -p -D %{SOURCE1} %{buildroot}/etc/init.d/goenabledCompute
install -m 755 -p -D %{SOURCE2} %{buildroot}/etc/init.d/e_nova-init
install -m 755 -p -D %{SOURCE3} %{buildroot}/etc/init.d/nova-cleanup
install -m 755 -p -D %{SOURCE4} %{buildroot}/etc/init.d/nova-startup
# Compute-Only Process Monitor Config files (source group 1x)
install -m 755 -d %{buildroot}%{local_etc_pmond}
install -m 755 -d %{buildroot}%{local_etc_nova}
install -m 644 -p -D %{SOURCE11} %{buildroot}%{local_etc_nova}/nova-cleanup.conf
install -m 644 -p -D %{SOURCE12} %{buildroot}%{local_etc_nova}/nova-compute.conf
install -m 644 -p -D %{SOURCE14} %{buildroot}%{local_etc_pmond}/libvirtd.conf
# Compute-Only Go Enabled Test (source group 2x)
install -m 755 -d %{buildroot}%{local_etc_goenabledd}
install -m 755 -p -D %{SOURCE21} %{buildroot}%{local_etc_goenabledd}/nova-goenabled.sh
install -m 755 -p -D %{SOURCE22} %{buildroot}%{local_etc_goenabledd}/virt-support-goenabled.sh
# Install to systemd (source group 3x)
install -m 644 -p -D %{SOURCE31} %{buildroot}%{_unitdir}/goenabled-compute.service
install -m 644 -p -D %{SOURCE32} %{buildroot}%{_unitdir}/e_nova-init.service
%post
/bin/systemctl enable goenabled-compute.service
/bin/systemctl enable e_nova-init.service
/bin/systemctl enable qemu_clean.service
%files
%license LICENSE
%defattr(-,root,root,-)
/etc/init.d/goenabledCompute
/etc/init.d/e_nova-init
/etc/init.d/nova-cleanup
/etc/init.d/nova-startup
%{local_etc_nova}/nova-cleanup.conf
%{local_etc_nova}/nova-compute.conf
%{local_etc_pmond}/libvirtd.conf
%{local_etc_goenabledd}/nova-goenabled.sh
%{local_etc_goenabledd}/virt-support-goenabled.sh
%{_unitdir}/goenabled-compute.service
%{_unitdir}/e_nova-init.service
%clean
rm -rf $RPM_BUILD_ROOT

60
mtce-compute/centos/mtce-compute.spec Normal file
View File

@ -0,0 +1,60 @@
%define local_etc_pmond %{_sysconfdir}/pmon.d
%define local_etc_goenabledd %{_sysconfdir}/goenabled.d
%define local_etc_nova %{_sysconfdir}/nova
%define debug_package %{nil}
Name: mtce-compute
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
Summary: Compute Node Maintenance Package
Group: base
License: Apache-2.0
Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
BuildRequires: systemd
BuildRequires: systemd-devel
Requires: bash
Requires: /bin/systemctl
Requires: qemu-kvm-ev
%description
Maintenance support files for compute-only node type
%prep
%setup
%build
%install
make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitdir} _datarootdir=%{_datarootdir}
%post
/bin/systemctl enable goenabled-compute.service
/bin/systemctl enable e_nova-init.service
/bin/systemctl enable qemu_clean.service
%files
%license LICENSE
%defattr(-,root,root,-)
%{_sysconfdir}/init.d/goenabledCompute
%{_sysconfdir}/init.d/e_nova-init
%{_sysconfdir}/init.d/nova-cleanup
%{_sysconfdir}/init.d/nova-startup
%{local_etc_nova}/nova-cleanup.conf
%{local_etc_nova}/nova-compute.conf
%{local_etc_pmond}/libvirtd.conf
%{local_etc_goenabledd}/nova-goenabled.sh
%{local_etc_goenabledd}/virt-support-goenabled.sh
%{_unitdir}/goenabled-compute.service
%{_unitdir}/e_nova-init.service
%{_datarootdir}/licenses/mtce-compute-1.0/LICENSE
%clean
rm -rf $RPM_BUILD_ROOT

47
mtce-compute/src/Makefile Executable file
View File

@ -0,0 +1,47 @@
SOURCE1 = goenabled
SOURCE2 = e_nova-init
SOURCE3 = nova-cleanup
SOURCE4 = nova-startup
SOURCE5 = LICENSE
SOURCE11 = nova-cleanup.conf
SOURCE12 = nova-compute.conf
SOURCE14 = libvirtd.conf
SOURCE21 = nova-goenabled.sh
SOURCE22 = virt-support-goenabled.sh
SOURCE31 = goenabled-compute.service
SOURCE32 = e_nova-init.service
local_etc_pmond = $(_sysconfdir)/pmon.d
local_etc_goenabledd = $(_sysconfdir)/goenabled.d
local_etc_nova = $(_sysconfdir)/nova
.PHONY: default
install:
# nfv-plugins
# # Compute-Only Init Scripts (source group x)
install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledCompute
install -m 755 -p -D scripts/$(SOURCE2) $(buildroot)/$(_sysconfdir)/init.d/e_nova-init
install -m 755 -p -D scripts/$(SOURCE3) $(buildroot)/$(_sysconfdir)/init.d/nova-cleanup
install -m 755 -p -D scripts/$(SOURCE4) $(buildroot)/$(_sysconfdir)/init.d/nova-startup
# # Compute-Only Process Monitor Config files (source group 1x)
install -m 755 -d $(buildroot)/$(local_etc_pmond)
install -m 755 -d $(buildroot)/$(local_etc_nova)
install -m 644 -p -D scripts/$(SOURCE11) $(buildroot)/$(local_etc_nova)/nova-cleanup.conf
install -m 644 -p -D scripts/$(SOURCE12) $(buildroot)/$(local_etc_nova)/nova-compute.conf
install -m 644 -p -D scripts/$(SOURCE14) $(buildroot)/$(local_etc_pmond)/libvirtd.conf
# # Compute-Only Go Enabled Test (source group 2x)
install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
install -m 755 -p -D scripts/$(SOURCE21) $(buildroot)/$(local_etc_goenabledd)/nova-goenabled.sh
install -m 755 -p -D scripts/$(SOURCE22) $(buildroot)/$(local_etc_goenabledd)/virt-support-goenabled.sh
# Install to systemd (source group 3x)
install -m 644 -p -D scripts/$(SOURCE31) $(buildroot)/$(_unitdir)/goenabled-compute.service
install -m 644 -p -D scripts/$(SOURCE32) $(buildroot)/$(_unitdir)/e_nova-init.service
# for license
install -m 755 -d $(buildroot)/$(_datarootdir)/licenses/mtce-compute-1.0
install -p -D -m 600 scripts/$(SOURCE5) $(buildroot)/$(_datarootdir)/licenses/mtce-compute-1.0/LICENSE

0
mtce-compute/cgts-mtce-compute-1.0/scripts/LICENSE → mtce-compute/src/scripts/LICENSE
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/e_nova-init → mtce-compute/src/scripts/e_nova-init
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/e_nova-init.service → mtce-compute/src/scripts/e_nova-init.service
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/goenabled → mtce-compute/src/scripts/goenabled
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/goenabled-compute.service → mtce-compute/src/scripts/goenabled-compute.service
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/libvirtd.conf → mtce-compute/src/scripts/libvirtd.conf
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/nova-cleanup → mtce-compute/src/scripts/nova-cleanup
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/nova-cleanup.conf → mtce-compute/src/scripts/nova-cleanup.conf
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/nova-compute.conf → mtce-compute/src/scripts/nova-compute.conf
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/nova-goenabled.sh → mtce-compute/src/scripts/nova-goenabled.sh
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/nova-init.service → mtce-compute/src/scripts/nova-init.service
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/nova-startup → mtce-compute/src/scripts/nova-startup
View File

0
mtce-compute/cgts-mtce-compute-1.0/scripts/virt-support-goenabled.sh → mtce-compute/src/scripts/virt-support-goenabled.sh
View File

2
mtce-control/PKG-INFO
View File

@ -1,5 +1,5 @@
Metadata-Version: 1.1
Name: cgts-mtce-control
Name: mtce-control
Version: 1.0
Summary: Titanium Cloud Platform Controller Node Maintenance Package
Home-page:

4
mtce-control/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
SRC_DIR="$PKG_BASE/cgts-mtce-control-1.0/scripts"
SRC_DIR="$PKG_BASE/src"
COPY_LIST="$SRC_DIR/* \
$PKG_BASE/LICENSE"
TIS_PATCH_VER=4
TIS_PATCH_VER=5

19
mtce-control/centos/cgts-mtce-control.spec → mtce-control/centos/mtce-control.spec
View File

@ -1,9 +1,6 @@
%define local_etc_pmond /%{_sysconfdir}/pmond.d
%define local_etc_goenabledd /%{_sysconfdir}/goenabled.d
%define debug_package %{nil}
Name: cgts-mtce-control
Name: mtce-control
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
Summary: Titanium Cloud Platform Controller Node Maintenance Package
@ -14,8 +11,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: goenabled
Source2: LICENSE
BuildRequires: systemd
BuildRequires: systemd-devel
@ -33,15 +28,7 @@ Maintenance support files for controller-only node type
%build
%install
install -m 755 -d %{buildroot}%{local_etc}
# Controller-Only Process Monitor Config files
install -m 755 -d %{buildroot}%{local_etc_pmond}
# Controller-Only Go Enabled Test
install -m 755 -d %{buildroot}%{local_etc_goenabledd}
make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitdir} _datarootdir=%{_datarootdir}
%post
if [ $1 -eq 1 ] ; then
@ -53,6 +40,8 @@ exit 0
%files
%license LICENSE
%defattr(-,root,root,-)
%{_sysconfdir}/init.d/goenabledControl
%{_datarootdir}/licenses/mtce-control-1.0/LICENSE
%clean
rm -rf $RPM_BUILD_ROOT

19
mtce-control/src/Makefile Executable file
View File

@ -0,0 +1,19 @@
SOURCE1 = goenabled
SOURCE2 = LICENSE
local_etc_pmond = $(_sysconfdir)/pmond.d
local_etc_goenabledd = $(_sysconfdir)/goenabled.d
.PHONY: default
install:
# Controller-Only Init Scripts
install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledControl
# Controller-Only Process Monitor Config files
install -m 755 -d $(buildroot)/$(local_etc_pmond)
# Controller-Only Go Enabled Test
install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
# for license
install -m 755 -d $(buildroot)/$(_datarootdir)/licenses/mtce-control-1.0
install -p -D -m 600 scripts/$(SOURCE2) $(buildroot)/$(_datarootdir)/licenses/mtce-control-1.0/LICENSE

0
mtce-control/cgts-mtce-control-1.0/scripts/LICENSE → mtce-control/src/scripts/LICENSE
View File

0
mtce-control/cgts-mtce-control-1.0/scripts/goenabled → mtce-control/src/scripts/goenabled
View File

2
mtce-storage/PKG-INFO
View File

@ -1,5 +1,5 @@
Metadata-Version: 1.1
Name: cgts-mtce-storage
Name: mtce-storage
Version: 1.0
Summary: CGTS Platform Storage Node Maintenance Package
Home-page:

4
mtce-storage/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
SRC_DIR="$PKG_BASE/cgts-mtce-storage-1.0/scripts"
SRC_DIR="$PKG_BASE/src"
COPY_LIST="$SRC_DIR/* \
$PKG_BASE/LICENSE"
TIS_PATCH_VER=3
TIS_PATCH_VER=4

61
mtce-storage/centos/cgts-mtce-storage.spec
View File

@ -1,61 +0,0 @@
%define local_etc_pmond /%{_sysconfdir}/pmond.d
%define local_etc_goenabledd /%{_sysconfdir}/goenabled.d
%define local_etc_servicesd /%{_sysconfdir}/services.d
Name: cgts-mtce-storage
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
Summary: Titanium Cloud Platform Storage Node Maintenance Package
Group: base
License: Apache-2.0
Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: goenabled
Source2: goenabled-storage.service
Source3: LICENSE
BuildRequires: systemd
BuildRequires: systemd-devel
Requires: bash
Requires: /bin/systemctl
%description
Maintenance support files for storage-only node type
%prep
%build
%install
# Storage-Only Init Scripts
install -m 755 -p -D %{SOURCE1} %{buildroot}/etc/init.d/goenabledStorage
# Storage-Only Process Monitor Config files
install -m 755 -d %{buildroot}%{local_etc_pmond}
# Storage-Only Go Enabled Tests
install -m 755 -d %{buildroot}%{local_etc_goenabledd}
# Storage-Only Services
install -m 755 -d %{buildroot}%{local_etc_servicesd}/storage
# Install systemd dir
install -m 644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}/goenabled-storage.service
%post
/bin/systemctl enable goenabled-storage.service
%files
%defattr(-,root,root,-)
/etc/init.d/goenabledStorage
%{_unitdir}/goenabled-storage.service
%clean
rm -rf $RPM_BUILD_ROOT

42
mtce-storage/centos/mtce-storage.spec Normal file
View File

@ -0,0 +1,42 @@
%define debug_package %{nil}
Name: mtce-storage
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
Summary: Titanium Cloud Platform Storage Node Maintenance Package
Group: base
License: Apache-2.0
Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
BuildRequires: systemd
BuildRequires: systemd-devel
Requires: bash
Requires: /bin/systemctl
%description
Maintenance support files for storage-only node type
%prep
%setup
%build
%install
make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitdir} _datarootdir=%{_datarootdir}
%post
/bin/systemctl enable goenabled-storage.service
%files
%license LICENSE
%defattr(-,root,root,-)
%{_sysconfdir}/init.d/goenabledStorage
%{_unitdir}/goenabled-storage.service
%{_datarootdir}/licenses/mtce-storage-1.0/LICENSE
%clean
rm -rf $RPM_BUILD_ROOT

25
mtce-storage/src/Makefile Executable file
View File

@ -0,0 +1,25 @@
SOURCE1 = goenabled
SOURCE2 = goenabled-storage.service
SOURCE3 = LICENSE
local_etc_pmond = $(_sysconfdir)/pmond.d
local_etc_goenabledd = $(_sysconfdir)/goenabled.d
local_etc_servicesd = $(_sysconfdir)/services.d
.PHONY: default
install:
# Storage-Only Init Scripts
install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledStorage
# Storage-Only Process Monitor Config files
install -m 755 -d $(buildroot)/$(local_etc_pmond)
# Storage-Only Go Enabled Tests
install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
# Storage-Only Services
install -m 755 -d $(buildroot)/$(local_etc_servicesd)/storage
# Install systemd dir
install -m 644 -p -D scripts/$(SOURCE2) $(buildroot)/$(_unitdir)/goenabled-storage.service
# for license
install -m 755 -d $(buildroot)/$(_datarootdir)/licenses/mtce-storage-1.0
install -p -D -m 600 scripts/$(SOURCE3) $(buildroot)/$(_datarootdir)/licenses/mtce-storage-1.0/LICENSE

0
mtce-storage/cgts-mtce-storage-1.0/scripts/LICENSE → mtce-storage/src/scripts/LICENSE
View File

0
mtce-storage/cgts-mtce-storage-1.0/scripts/goenabled → mtce-storage/src/scripts/goenabled
View File

0
mtce-storage/cgts-mtce-storage-1.0/scripts/goenabled-storage.service → mtce-storage/src/scripts/goenabled-storage.service
View File