starlingx/meta-starlingx
Code Issues Proposed changes

stx-config: set and limit checkouts to subpaths

Browse Source 
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Babak Sarashki 2020-09-22 19:38:36 -07:00
parent fb9f2dfa09
commit 39bdd9d98d
9 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-stx-flock/stx-config/cgts-client.bb
View File

@ -1,7 +1,6 @@
require config-common.inc
S = "${S_DIR}/sysinv/cgts-client/cgts-client"
SUBPATH0 = "sysinv/cgts-client/cgts-client"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"

18
meta-stx-flock/stx-config/config-common.inc
View File

@ -1,13 +1,15 @@
DESCRIPTION = "stx-config"
PROTOCOL = "https"
BRANCH = "r/stx.3.0"
SRCREV = "b51e4ef738e0020f11f164fd3f86399872caf3c6"
S_DIR = "${WORKDIR}/git"
SRCREV_opendev = "b51e4ef738e0020f11f164fd3f86399872caf3c6"
DESTSUFFIX = "${PN}-${PV}"
PV = "1.0.0"
SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
SRC_URI = "\
git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
"
DEPENDS = "\
puppet \
@ -15,14 +17,4 @@ DEPENDS = "\
python-pbr-native \
"
# Other packages depend on tsconfig build it first
#require tsconfig.inc
#require config-gate.inc
#require controllerconfig.inc
#require storageconfig.inc
#require cgts-client.inc
#require sysinv.inc
#require sysinv-agent.inc
#require workerconfig.inc
DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"

3
meta-stx-flock/stx-config/config-gate.bb
View File

@ -1,9 +1,8 @@
PACKAGES += " config-gate-worker"
require config-common.inc
S = "${S_DIR}/config-gate/files"
SUBPATH0 = "config-gate/files"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

41
meta-stx-flock/stx-config/controllerconfig.bb
View File

@ -1,7 +1,6 @@
require config-common.inc
S = "${S_DIR}/controllerconfig/controllerconfig"
SUBPATH0 = "controllerconfig/controllerconfig"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
@ -30,28 +29,28 @@ SYSTEMD_AUTO_ENABLE_controllerconfig = "enable"
do_install_append() {
install -p -D -m 700 scripts/keyringstaging ${D}/${bindir}
install -p -D -m 700 scripts/openstack_update_admin_password ${D}/${bindir}
install -p -D -m 700 scripts/install_clone.py ${D}/${bindir}
install -p -D -m 700 scripts/finish_install_clone.sh ${D}/${bindir}
install -p -D -m 700 scripts/keyringstaging ${D}/${bindir}
install -p -D -m 700 scripts/openstack_update_admin_password ${D}/${bindir}
install -p -D -m 700 scripts/install_clone.py ${D}/${bindir}
install -p -D -m 700 scripts/finish_install_clone.sh ${D}/${bindir}
install -d -m 755 ${D}/${sysconfdir}/goenabled.d
install -d -m 755 ${D}/${sysconfdir}/init.d
install -p -D -m 700 scripts/config_goenabled_check.sh ${D}/${sysconfdir}/goenabled.d
install -p -D -m 755 scripts/controller_config ${D}/${sysconfdir}/init.d/controller_config
install -d -m 755 ${D}/${sysconfdir}/goenabled.d
install -d -m 755 ${D}/${sysconfdir}/init.d
install -p -D -m 700 scripts/config_goenabled_check.sh ${D}/${sysconfdir}/goenabled.d
install -p -D -m 755 scripts/controller_config ${D}/${sysconfdir}/init.d/controller_config
## Install Upgrade scripts
install -d -m 755 ${D}/${sysconfdir}/upgrade.d
install -p -m 755 upgrade-scripts/16-neutron-move-bindings-off-controller-1.py ${D}/${sysconfdir}/upgrade.d
install -p -m 755 upgrade-scripts/20-sysinv-retire-ceph-cache-tier-sp.py ${D}/${sysconfdir}/upgrade.d
## Install Upgrade scripts
install -d -m 755 ${D}/${sysconfdir}/upgrade.d
install -p -m 755 upgrade-scripts/16-neutron-move-bindings-off-controller-1.py ${D}/${sysconfdir}/upgrade.d
install -p -m 755 upgrade-scripts/20-sysinv-retire-ceph-cache-tier-sp.py ${D}/${sysconfdir}/upgrade.d
install -p -D -m 664 scripts/controllerconfig.service ${D}/${sysconfdir}/systemd/system/controllerconfig.service
sed -i -e 's/network.target/networking.target/g' \
install -p -D -m 664 scripts/controllerconfig.service ${D}/${sysconfdir}/systemd/system/controllerconfig.service
sed -i -e 's/network.target/networking.target/g' \
${D}/${sysconfdir}/systemd/system/controllerconfig.service
sed -i -e 's|/usr/local/bin|${bindir}|' \
${D}${libdir}/python2.7/site-packages/controllerconfig/utils.py \
${D}${libdir}/python2.7/site-packages/controllerconfig/upgrades/utils.py \
${D}${sysconfdir}/init.d/controller_config
sed -i -e 's|/usr/local/bin|${bindir}|' \
${D}${libdir}/python2.7/site-packages/controllerconfig/utils.py \
${D}${libdir}/python2.7/site-packages/controllerconfig/upgrades/utils.py \
${D}${sysconfdir}/init.d/controller_config
}

3
meta-stx-flock/stx-config/storageconfig.bb
View File

@ -1,7 +1,6 @@
require config-common.inc
S = "${S_DIR}/storageconfig/storageconfig/"
SUBPATH0 = "storageconfig/storageconfig/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

3
meta-stx-flock/stx-config/sysinv-agent.bb
View File

@ -1,7 +1,6 @@
require config-common.inc
S = "${S_DIR}/sysinv/sysinv-agent"
SUBPATH0 = "sysinv/sysinv-agent"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

3
meta-stx-flock/stx-config/sysinv.bb
View File

@ -1,7 +1,6 @@
require config-common.inc
S = "${S_DIR}/sysinv/sysinv/sysinv"
SUBPATH0 = "sysinv/sysinv/sysinv"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"

3
meta-stx-flock/stx-config/tsconfig.bb
View File

@ -1,7 +1,6 @@
require config-common.inc
S = "${S_DIR}/tsconfig/tsconfig"
SUBPATH0 = "tsconfig/tsconfig"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

3
meta-stx-flock/stx-config/workerconfig.bb
View File

@ -1,4 +1,3 @@
PACKAGES += " \
workerconfig-standalone \
workerconfig-subfunction \
@ -6,7 +5,7 @@ PACKAGES += " \
require config-common.inc
S = "${S_DIR}/workerconfig/workerconfig"
SUBPATH0 = "workerconfig/workerconfig"
LICENSE = "Apache-2.0"