Renamed bb files to .inc and removed the exsource

conf/layer.conf

@@ -64,4 +64,18 @@ IMAGE_INSTALL_append += " \
 	packagegroup-stx-config \
 	packagegroup-stx-fault \
 	packagegroup-stx-metal \
+	packagegroup-stx-ha \
+	packagegroup-stx-nfv \
+	starlingx-dashboard \
+	packagegroup-stx-update \
+	packagegroup-stx-upstream \
+	packagegroup-stx-integ-base \
+	lighttpd \
+	"
+#	playbookconfig 
+
+IMAGE_INSTALL_append += " \
+	python-oslo.messaging \
+	python-horizon \
+	python-keyring \
 	"

recipes-core/packagegroups/packagegroup-stx-config.bb

@@ -21,7 +21,8 @@ RDEPENDS_packagegroup-stx-config = " \
 	puppet-modules-wrs \
 	storageconfig \
 	worker-utils \
-	workerconfig \
+	workerconfig-standalone \
+	workerconfig-subfunction \
 	pm-qos-mgr \
 	sysinv \
 	"

recipes-core/packagegroups/packagegroup-stx-ha.bb

@@ -18,7 +18,9 @@ RDEPENDS_packagegroup-stx-ha = " \
 	sm-api \
 	sm \
 	sm-client \
-	sm-common \
+	libsm-common \
+	sm-common-libs \
 	sm-db \
 	sm-tools \
+	sm-eru \
 	"

recipes-core/packagegroups/packagegroup-stx-integ-cff.bb

@@ -1,30 +0,0 @@
-SUMMARY = "StarlingX/cgsc-root/stx/stx-integ/config-files"
-PR = "r0"
-
-#
-# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
-#
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-
-inherit packagegroup
-
-PROVIDES = "${PACKAGES}"
-PACKAGES = " \
-	packagegroup-stx-integ-cff \
-	"
-
-RDEPENDS_packagegroup-stx-integ-cff = " \
-	audit-config \
-	docker-config \
-	io-scheduler \
-	iptables-config \
-	memcached-custom \
-	ntp-config \
-	pam-config \
-	rsync-config \
-	shadow-utils-config \
-	sudo-config \
-	syslog-ng-config \
-	util-linux-config \
-	"

recipes-core/packagegroups/packagegroup-stx-integ.bb

@@ -0,0 +1,61 @@
+SUMMARY = "StarlingX/cgsc-root/stx/stx-integ/config-files"
+PR = "r0"
+
+#
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+
+inherit packagegroup
+
+PROVIDES = "${PACKAGES}"
+
+PACKAGES = " \
+	packagegroup-stx-integ \
+	packagegroup-stx-integ-base \
+	packagegroup-stx-integ-cff \
+	packagegroup-stx-integ-puppet-modules \
+	"
+
+RDEPENDS_packagegroup-stx-integ = " \
+	packagegroup-stx-integ-base \
+	packagegroup-stx-integ-cff \
+	packagegroup-stx-integ-puppet-modules \
+	"
+
+RDEPENDS_packagegroup-stx-integ-base = " \
+	cgcs-users \
+	dhcp-config \
+	dnsmasq-config \
+	haproxy-config \
+	initscripts-config \
+	net-snmp-config \
+	openssh-config \
+	setup-config \
+	systemd-config \
+	lighttpd-config \
+	"
+
+RDEPENDS_packagegroup-stx-integ-cff = " \
+	audit-config \
+	docker-config \
+	io-scheduler \
+	iptables-config \
+	memcached-custom \
+	ntp-config \
+	pam-config \
+	rsync-config \
+	shadow-utils-config \
+	sudo-config \
+	syslog-ng-config \
+	util-linux-config \
+	"
+
+RDEPENDS_packagegroup-stx-integ-puppet-modules = " \
+	puppet \
+	puppet-boolean \
+	puppet-create-resources \
+	puppet-dnsmasq \
+	puppet-drbd \
+	"

recipes-core/packagegroups/packagegroup-stx-metal.bb

@@ -21,6 +21,10 @@ PACKAGES = " \
 RDEPENDS_packagegroup-stx-metal = " \
 	inventory \
 	mtce \
+	mtce-pmon \
+	mtce-hwmon \
+	mtce-hostw \
+	mtce-lmon \
 	mtce-compute \
 	mtce-control \
 	mtce-storage \

recipes-core/packagegroups/packagegroup-stx-nfv.bb

@@ -20,6 +20,7 @@ RDEPENDS_packagegroup-stx-nfv = " \
 	nfv-tools \
 	nfv-vim \
 	nfv-client \
-	mtce-guest \
+	mtce-guestagent \
+	mtce-guestserver \
 	nova-api-proxy \
 	"

recipes-core/packagegroups/packagegroup-stx-update.bb

@@ -19,5 +19,5 @@ RDEPENDS_packagegroup-stx-update = " \
 	enable-dev-patch \
 	patch-alarm \
 	tsconfig \
-	python-requests-toolbelt \
+	requests-toolbelt \
 	"

recipes-core/packagegroups/packagegroup-stx-upstream.bb

@@ -21,21 +21,30 @@ PACKAGES = " \
 
 # TODO:
 # See docs/progress.txt file
-# Port required/missing packages.
+# Port required/missing packages :
+#	openstack-helm-infra.bb
+#	openstack-helm.bb 
+#	python-horizon.bbappend
 
 RDEPENDS_packagegroup-stx-upstream = " \
 	python-barbicanclient \
 	python-cinderclient \
 	python-glanceclient \
+	python-aodhclient \
 	python-heatclient \
 	python-horizon \
+	python-ironicclient \
 	python-keystoneauth1 \
 	python-keystoneclient \
 	python-magnumclient \
+	python-muranoclient \
 	python-neutronclient \
 	python-novaclient \
 	python-openstackclient \
 	python-openstacksdk \
 	stx-ocf-scripts \
 	rabbitmq-server-config \
+	openstack-ras \
+	python-gnocchiclient \
+	python-pankoclient \
 	"

recipes-core/stx-ansible-playbooks/playbookconfig.bb

@@ -1,4 +1,7 @@
-DESCRIPTION = "stx-ansible-playbooks"
+DESCRIPTION = " stx-ansible-playbooks"
+
+# TODO:
+# make this and others to .bbappends
 
 STABLE = "starlingx/master"
 PROTOCOL = "https"
@@ -35,6 +38,7 @@ do_install () {
 		DESTDIR=${D}/${sysconfdir}/
 	mv ${D}/${sysconfdir}/playbooks ${D}/${sysconfdir}/ansible
 	chmod 644 ${D}/${sysconfdir}/ansible/ansible.cfg
+	mv ${D}/${sysconfdir}/ansible/hosts ${D}/${sysconfdir}/ansible/stx-hosts
 	chmod 644 ${D}/${sysconfdir}/ansible/hosts
 }
 

recipes-core/stx-config/workerconfig.inc

@@ -1,5 +1,7 @@
-PACKAGES += " workerconfig"
-RDEPENDS_workerconfig += " bash"
+PACKAGES += " workerconfig-standalone"
+PACKAGES += " workerconfig-subfunction"
+
+RDEPENDS_workerconfig-standalone += " bash"
 
 do_install_append () {
 	cd ${S}/workerconfig/workerconfig/
@@ -7,10 +9,13 @@ do_install_append () {
 		SYSTEMDDIR=${D}/${systemd_system_unitdir} install
 }
 
-FILES_workerconfig += "  \
+FILES_workerconfig-standalone += "  \
 		${systemd_system_unitdir}/config/workerconfig-standalone.service \
-		${systemd_system_unitdir}/config/workerconfig-combined.service \
 		${sysconfdir}/goenabled.d/config_goenabled_check.sh \
 		${sysconfdir}/init.d/worker_config \
 		${sysconfdir}/init.d/worker_services \
 		"
+
+FILES_workerconfig-subfunction += "  \
+		${systemd_system_unitdir}/config/workerconfig-combined.service \
+		"

recipes-core/stx-gui/stx-gui.bb

@@ -1,5 +1,6 @@
 DESCRIPTION = "stx-gui"
 
+PACKAGES = "starlingx-dashboard"
 
 STABLE = "starlingx/master"
 PROTOCOL = "https"
@@ -16,10 +17,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRC_URI = "git://opendev.org/starlingx/gui.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
 
-inherit externalsrc
-EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-gui"
-cgcs_doc_deploy = "/opt/deploy/cgcs_doc"
-
 inherit setuptools
 
 DEPENDS = "\
@@ -54,3 +51,7 @@ do_install () {
 	#install -p -D -m 755 build/lib/starlingx_dashboard/local/local_settings.d/* \
 	#	${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d
 }
+
+FILES_starlingx-dashboard = " \
+	${libdir}/python2.7/site-packages/ \
+	"

recipes-core/stx-ha/files/0001-Allow-user-to-define-destination-libdir.patch

@@ -0,0 +1,47 @@
+From f9090b7fb267fec4a6cd100fe1523458ba9a0411 Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Thu, 11 Jul 2019 15:10:18 -0700
+Subject: [PATCH] Allow user to define destination libdir
+
+---
+ service-mgmt/sm-db-1.0.0/src/Makefile | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/service-mgmt/sm-db-1.0.0/src/Makefile b/service-mgmt/sm-db-1.0.0/src/Makefile
+index a29b1ac..379ea00 100644
+--- a/service-mgmt/sm-db-1.0.0/src/Makefile
++++ b/service-mgmt/sm-db-1.0.0/src/Makefile
+@@ -33,6 +33,10 @@ EXTRACCFLAGS= -D__STDC_FORMAT_MACROS
+ LDLIBS= -lsqlite3 -lglib-2.0 -luuid -lrt -lsm_common
+ LDFLAGS = -shared -rdynamic
+ 
++LIB_DIR = /usr/lib64
++BIN_DIR = /usr/bin
++INC_DIR = /usr/include
++
+ build: libsm_db.so sm_db_build
+ 
+ .c.o:
+@@ -51,12 +55,13 @@ sm_db_build: ${OBJS}
+ 	$(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) $(LDLIBS) -o sm_db_build
+ 
+ install:
+-	install -d ${DEST_DIR}/usr/lib64
+-	install libsm_db.so.${VER} $(DEST_DIR)/usr/lib64
+-	cp -P libsm_db.so libsm_db.so.$(VER_MJR) $(DEST_DIR)/usr/lib64
+-	install -d ${DEST_DIR}/usr/include
+-	install -m 0644 *.h ${DEST_DIR}/usr/include
+-	install -d 755 ${DEST_DIR}/usr/bin
++	install -d ${DEST_DIR}/${LIB_DIR}
++	install libsm_db.so.${VER} $(DEST_DIR)/${LIB_DIR}
++	cp -P libsm_db.so libsm_db.so.$(VER_MJR) $(DEST_DIR)/${LIB_DIR}
++	install -d ${DEST_DIR}/${INC_DIR}
++	install -m 0644 *.h ${DEST_DIR}/${INC_DIR}
++	install -d 755 ${DEST_DIR}/${BIN_DIR}
++	install -m 0744 sm_db_build ${DEST_DIR}/${BIN_DIR}
+ 
+ clean:
+ 	@rm -f *.o *.a *.so *.so.*
+-- 
+2.17.1
+

recipes-core/stx-ha/files/0001-Install-sm-eru-sm-eru-dump-and-sm-eru-watchdog.patch

@@ -0,0 +1,30 @@
+From ff46ee1fa9d5b7269f5a05200d96d673a358e710 Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Thu, 11 Jul 2019 13:07:49 -0700
+Subject: [PATCH] Install sm-eru, sm-eru-dump, and sm-eru-watchdog
+
+---
+ service-mgmt/sm-common-1.0.0/src/Makefile | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/service-mgmt/sm-common-1.0.0/src/Makefile b/service-mgmt/sm-common-1.0.0/src/Makefile
+index 99f736d..7d138f9 100644
+--- a/service-mgmt/sm-common-1.0.0/src/Makefile
++++ b/service-mgmt/sm-common-1.0.0/src/Makefile
+@@ -69,8 +69,11 @@ install:
+ 	# install of these 3 are in the .spec file so that they can be
+ 	# renamed with '-' like they are in the bitbake file.
+ 	#
+-	# install -d $(DEST_DIR)$(BIN_DIR)
+-	# install sm_watchdog sm_eru sm_eru_dump $(DEST_DIR)$(BIN_DIR)
++
++	install -d -m 755 $(DEST_DIR)$(BIN_DIR)
++	install -p -m 755 sm_eru $(DEST_DIR)$(BIN_DIR)/sm-eru 
++	install -p -m 755 sm_eru_dump $(DEST_DIR)$(BIN_DIR)/sm-eru-dump
++	install -p -m 755 sm_watchdog $(DEST_DIR)$(BIN_DIR)/sm-watchdog
+ 	install -d $(DEST_DIR)$(LIB_DIR)
+ 	install libsm_common.so.${VER} $(DEST_DIR)$(LIB_DIR)
+ 	cp -P libsm_common.so libsm_common.so.$(VER_MJR) $(DEST_DIR)$(LIB_DIR)
+-- 
+2.17.1
+

recipes-core/stx-ha/sm-api.inc

@@ -1,5 +1,7 @@
 PACKAGES += " sm-api"
 
+RDEPENDS_sm-api += " bash"
+
 do_configure_prepend () {
 	cd ${S}/service-mgmt-api/sm-api
 	distutils_do_configure
@@ -25,4 +27,13 @@ do_install_prepend () {
 	install -m 644 etc/sm-api/policy.json ${D}/${sysconfdir}/sm-api
 }
 
-FILES_sm-api = " ${systemd_unitdir}/* "
+FILES_sm-api = " \
+	${libdir}/python2.7/site-packages/sm_api*.egg-info/ \
+	${libdir}/python2.7/site-packages/sm_api/ \
+	${systemd_system_unitdir}/sm-api.service \
+	${sysconfdir}/init.d/sm-api \
+	${sysconfdir}/pmon.d/sm-api.conf \
+	${sysconfdir}/sm/sm_api.ini \
+	${sysconfdir}/sm-api/policy.json \
+	${bindir}/sm-api \
+	"

recipes-core/stx-ha/sm-client.inc

@@ -17,4 +17,8 @@ do_install_prepend () {
 	install -m 755 usr/bin/smc ${D}/${bindir}
 }
 
-FILES_sm-client = " "
+FILES_sm-client = " \
+	${bindir}/smc \
+	${libdir}/python2.7/site-packages/sm_client*.egg-info/ \
+	${libdir}/python2.7/site-packages/sm_client/ \
+	"

recipes-core/stx-ha/sm-common.inc

@@ -1,10 +1,14 @@
-PACKAGES += " sm-common"
+PACKAGES += " libsm-common"
+PACKAGES += " sm-common-libs"
+PACKAGES += " sm-eru"
 
 #DEPENDS += " \
 #	glib-2.0 \
 #	sqlite3 \
 #	"
 
+RDEPENDS_sm-eru += " bash"
+
 do_configure_prepend () {
 	:
 } 
@@ -13,7 +17,8 @@ do_compile_prepend () {
 	cd ${S}/service-mgmt/sm-common-1.0.0/src
 	oe_runmake -e VER=0 VER_MJR=1 \
 		INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \
-		CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic"
+		CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic" \
+		EXTRACCFLAGS="${LDFLAGS}" 
 	
 }
 
@@ -21,36 +26,39 @@ do_install_prepend () {
 	cd ${S}/service-mgmt/sm-common-1.0.0/src
 	oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \
 			LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install
+ 
+	cd ${S}/service-mgmt/sm-common-1.0.0/
+	install -d -m 755 ${D}/${systemd_system_unitdir}
+	# install -m 755 -d ${D}/${sysconfdir}/pmon.d
+	# install -m 755 -d ${D}/${sysconfdir}/init.d
+
+	install -m 644 -p -D scripts/sm-eru.service ${D}/${systemd_system_unitdir}/sm-eru.service
+	install -m 644 -p -D scripts/sm-watchdog.service ${D}/${systemd_system_unitdir}/sm-watchdog.service
+
+	install -m 640 -p -D scripts/sm-eru.conf ${D}/${sysconfdir}/pmon.d/sm-eru.conf
+	install -m 640 -p -D scripts/sm-watchdog.conf ${D}/${sysconfdir}/pmon.d/sm-watchdog.conf
+	install -m 750 -p -D scripts/sm-eru ${D}/${sysconfdir}/init.d/sm-eru
+	# install -m 750 -p -D scripts/sm-watchdog ${D}/${sysconfdir}/init.d/sm-watchdog
 }
 
-#FILES_sm-common-dev_append = " var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so"
-FILES_sm-common = " \
+FILES_libsm-common = " \
 	${libdir}/libsm_common.so.0 \
+	${libdir}/libsm_common.so.1 \
+	${libdir}/libsm_common.so \
+	"
+
+FILES_sm-common-libs = " \
 	var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.0 \
+	var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.1 \
 	"
-FILES_sm-common-dev = " \
-	${includedir}/sm_trap_thread.h \
-	${includedir}/sm_time.h \
-	${includedir}/sm_watchdog_nfs.h \
-	${includedir}/sm_debug.h \
-	${includedir}/sm_uuid.h \
-	${includedir}/sm_timer.h \
-	${includedir}/sm_node_stats.h \
-	${includedir}/sm_limits.h \
-	${includedir}/sm_trap.h \
-	${includedir}/sm_watchdog_process.h \
-	${includedir}/sm_netlink.h \
-	${includedir}/sm_list.h \
-	${includedir}/sm_utils.h \
-	${includedir}/sm_selobj.h \
-	${includedir}/sm_debug_thread.h \
-	${includedir}/sm_node_utils.h \
-	${includedir}/sm_util_types.h \
-	${includedir}/sm_sha512.h \
-	${includedir}/sm_thread_health.h \
-	${includedir}/sm_eru_db.h \
-	${includedir}/sm_types.h \
-	${includedir}/sm_hw.h \
-	${includedir}/sm_eru_process.h \
-	${includedir}/sm_watchdog_module.h \
+
+FILES_sm-eru = " \
+	${bindir}/sm-eru \
+	${bindir}/sm-eru-dump \
+	${bindir}/sm-watchdog \
+	${systemd_system_unitdir}/sm-eru.service \
+	${systemd_system_unitdir}/sm-watchdog.service \
+	${sysconfdir}/init.d/sm-eru \
+	${sysconfdir}/pmon.d/sm-eru.conf \
+	${sysconfdir}/pmon.d/sm-watchdog.conf \
 	"

recipes-core/stx-ha/sm-db.inc

@@ -11,9 +11,12 @@ do_configure_prepend () {
 
 do_compile_prepend () {
 	cd ${S}/service-mgmt/sm-db-1.0.0/src
+
 	oe_runmake -e VER=0 VER_MJR=1 \
-		INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \
-		CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic"
+		INCLUDES="-I. -I${S}/service-mgmt/sm-common-1.0.0/src " \
+		CCFLAGS="${CXXFLAGS} -fPIC" \
+		LDFLAGS="${LDFLAGS} -shared -rdynamic -L${S}/service-mgmt/sm-common-1.0.0/src " \
+		EXTRACCFLAGS="-D_TEST__AA__BB ${LDFLAGS} -L${S}/service-mgmt/sm-common-1.0.0/src "
 	
 }
 
@@ -23,4 +26,8 @@ do_install_prepend () {
 			LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install
 }
 
-FILES_sm-db = " "
+FILES_sm-db = " \
+	${bindir}/sm_db_build \
+	${libdir}/libsm_db.so.1 \
+	${libdir}/libsm_db.so.0 \
+	"

recipes-core/stx-ha/sm-tools.inc

@@ -20,4 +20,17 @@ do_install_prepend () {
 	distutils_do_install
 }
 
-FILES_sm-tools = " "
+FILES_sm-tools = " \
+	${bindir}/sm-query \
+	${bindir}/sm-provision \
+	${bindir}/sm-restart \
+	${bindir}/sm-unmanage \
+	${bindir}/sm-dump \
+	${bindir}/sm-iface-state \
+	${bindir}/sm-configure \
+	${bindir}/sm-manage \
+	${bindir}/sm-deprovision \
+	${bindir}/sm-restart-safe \
+	${libdir}/python2.7/site-packages/sm_tools-*.egg-info/ \
+	${libdir}/python2.7/site-packages/sm_tools/ \
+	"

recipes-core/stx-ha/sm.inc

@@ -1,21 +1,29 @@
 PACKAGES += " sm"
 
-DEPENDS += " \
-sm-common \
-sm-db \
-fm-api \
-mtce \
-sqlite3 \
-"
+#DEPENDS = " \
+#	sm-common \
+#	sm-db \
+# 	stx-metal \
+# 	stx-fault
+#	sqlite3 \
+#	"
 
 do_configure_prepend () {
 	:
 }
 
+# TODO:
+# Fix the Makefiles. We should not have to do this stuff here.
+
 do_compile_prepend() {
 	cd ${S}/service-mgmt/sm-1.0.0/src
 	oe_runmake -e -j1 VER=0 VER_MJR=1 \
-		INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \
+		INCLUDES="-I. -I${S}/service-mgmt/sm-common-1.0.0/src \
+			-I${S}/service-mgmt/sm-db-1.0.0/src $(pkg-config --cflags glib-2.0)" \
+		EXTRACCFLAGS="-I. -I${S}/service-mgmt/sm-common-1.0.0/src \
+			-I${S}/service-mgmt/sm-db-1.0.0/src $(pkg-config --cflags glib-2.0) \
+			-L${S}/service-mgmt/sm-common-1.0.0/src -L${S}/service-mgmt/sm-db-1.0.0/src \
+				$(pkg-config --ldlags glib-2.0)" \
 		CCFLAGS="${CXXFLAGS} -std=c++11" LDFLAGS="${LDFLAGS} -rdynamic"
 }
 
@@ -26,7 +34,8 @@ do_install_prepend () {
 }
 
 FILES_sm = " \
-"
+	${bindir}/sm \
+	"
 
 pkg_postinst_ontarget_${PN}_append () {
         /usr/bin/systemctl enable sm.service >/dev/null 2>&1

recipes-core/stx-ha/stx-ha.bb

@@ -11,17 +11,18 @@ LICENSE = "Apache-2.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRC_URI = "git://opendev.org/starlingx/ha.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
+SRC_URI = "git://opendev.org/starlingx/ha.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://0001-Install-sm-eru-sm-eru-dump-and-sm-eru-watchdog.patch \
+	file://0001-Allow-user-to-define-destination-libdir.patch \
+	"
 
 
 inherit setuptools
 inherit pkgconfig
 
-#	sm-common sm-db 
-#	mtce 
-
 DEPENDS += " \
 	stx-fault \
+	stx-metal \
 	sqlite3 \
 	python \
 	python-pbr-native \
@@ -29,16 +30,16 @@ DEPENDS += " \
 	sqlite3 \
 	"
 
+require sm.inc
+require sm-db.inc
 require sm-common.inc
-#require sm-api.inc
-#require sm-client.inc
-#require sm-common.inc
-#require sm-db.inc
-#require sm-tools.inc
-#require sm.inc
+require sm-api.inc
+require sm-client.inc
+require sm-tools.inc
 
 #TODO: Shouldn't have to do this
 LDFLAGS_remove = "-Wl,--as-needed"
+
 do_configure () {
 	:
 } 
@@ -55,3 +56,10 @@ pkg_postinst_ontarget_${PN} () {
 }
 
 FILES_${PN} = " "
+FILES_${PN}-dev += " \
+	var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so \
+	"
+#	var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.1 \
+#	var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.0 \
+#	${libdir}/libsm_common.so.1 \
+#	${libdir}/libsm_common.so.0 

recipes-core/stx-integ-ceph/stx-ineg-ceph.inc

@@ -1,2 +0,0 @@
-inherit externalsrc
-EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ"

recipes-core/stx-integ-config-files/audit-config.bb

@@ -1,38 +0,0 @@
-DESCRIPTION = "audit-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/audit-config
-	install -d -m 0755 ${D}/${datadir}/starlingx/
-	install -p -m 0644 files/syslog.conf ${D}/${datadir}/starlingx/syslog.conf
-}
-
-FILES_${PN}_append += " \
-	${systemd_system_unitdir} \
-	${datadir} \
-	"\
-		

recipes-core/stx-integ-config-files/docker-config.bb

@@ -1,34 +0,0 @@
-DESCRIPTION = "docker-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/docker-config/files
-	oe_runmake -e DATADIR=${D}/${datadir} \
-		SYSCONFDIR=${D}/${sysconfdir} install
-}
-
-#FILES_${PN}_append += " ${systemd_system_unitdir} "

recipes-core/stx-integ-config-files/io-scheduler.bb

@@ -1,34 +0,0 @@
-DESCRIPTION = "io-scheduler"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	install -d -m 0755 ${D}/${sysconfdir}/udev/rules.d
-	install -m644 ${S}/config-files/io-scheduler/centos/files/60-io-scheduler.rules \
-		${D}/${sysconfdir}/udev/rules.d/60-io-scheduler.rules 
-}
-
-#FILES_${PN}_append += " ${systemd_system_unitdir} "

recipes-core/stx-integ-config-files/iptables-config.bb

@@ -1,40 +0,0 @@
-DESCRIPTION = "iptables-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/iptables-config 
-	install -d -m0755 ${D}/${sysconfdir}/sysconfig
-	install -d -m0755 ${D}/${datadir}/starlingx
-
-	install -m600 files/iptables.rules ${D}/${datadir}/starlingx/iptables.rules
-	install -m600 files/ip6tables.rules ${D}/${datadir}/starlingx/ip6tables.rules
-
-	install -m600 files/iptables.rules ${D}/${sysconfdir}/sysconfig/iptables.rules
-	install -m600 files/ip6tables.rules ${D}/${sysconfdir}/sysconfig/ip6tables.rules
-}
-
-FILES_${PN}_append += " ${datadir} "

recipes-core/stx-integ-config-files/memcached-custom.bb

@@ -1,35 +0,0 @@
-DESCRIPTION = "memcached-custom"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/memcached-custom
-	install -d -m0755 ${D}/${systemd_system_unitdir}
-
-	install -m644 files/memcached.service ${D}/${systemd_system_unitdir}/
-}
-
-FILES_${PN}_append += " ${systemd_system_unitdir} "

recipes-core/stx-integ-config-files/ntp-config.bb

@@ -1,40 +0,0 @@
-DESCRIPTION = "ntp-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/ntp-config 
-	install -d -m0755 ${D}/${datadir}/starlingx
-	install -d -m0755 ${D}/${sysconfdir}/sysconfig
-
-	install -m644 files/ntp.conf ${D}/${datadir}/starlingx/ntp.config
-	install -m644 files/ntpd.sysconfig ${D}/${datadir}/starlingx/ntpd.sysconfig
-
-	install -m644 files/ntp.conf ${D}/${sysconfdir}/ntp.config
-	install -m644 files/ntpd.sysconfig ${D}/${sysconfdir}/sysconfig/ntpd
-}
-
-FILES_${PN}_append += " ${datadir} "

recipes-core/stx-integ-config-files/rsync-config.bb

@@ -1,37 +0,0 @@
-DESCRIPTION = "rsync-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/rsync-config/
-	install -d -m0755 ${D}/${datadir}/starlingx
-	install -d -m0755 ${D}/${sysconfdir}/
-
-	install  -m 644 files/rsyncd.conf ${D}/${datadir}/starlingx/stx.rsyncd.conf
-	install  -m 644 files/rsyncd.conf ${D}/${sysconfdir}/rsyncd.conf
-}
-
-FILES_${PN}_append += " ${datadir} "

recipes-core/stx-integ-config-files/shadow-utils-config.bb

@@ -1,43 +0,0 @@
-DESCRIPTION = "shadow-utils-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/shadow-utils-config 
-	install -d -m0755 ${D}/${datadir}/starlingx
-	install -d -m0755 ${D}/${sysconfdir}/init.d
-	install -d -m0755 ${D}/${systemd_system_unitdir}
-
-	install -m644 files/login.defs ${D}/${datadir}/starlingx/login.defs
-
-	install -m644 files/clear_shadow_locks.service ${D}/${systemd_system_unitdir}/
-	install -m644 files/login.defs ${D}/${sysconfdir}/login.defs
-}
-
-FILES_${PN}_append += " \
-	${datadir} \
-	${systemd_system_unitdir} \
-	"

recipes-core/stx-integ-config-files/stx-integ-config-files.inc

@@ -1,2 +0,0 @@
-inherit externalsrc
-EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ/"

recipes-core/stx-integ-config-files/util-linux-config.bb

@@ -1,40 +0,0 @@
-DESCRIPTION = "util-linux-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/config-files/util-linux-config 
-	install -d -m0755 ${D}/${datadir}/starlingx
-	install -d -m0755 ${D}/${sysconfdir}/pam.d
-
-	install -m644 files/stx.su ${D}/${datadir}/starlingx/stx.su
-	install -m644 files/stx.login ${D}/${datadir}/starlingx/stx.login
-
-	install -m644 files/stx.su ${D}/${sysconfdir}/pam.d/su
-	install -m644 files/stx.login ${D}/${sysconfdir}/pam.d/login
-}
-
-FILES_${PN}_append += " ${datadir} "

recipes-core/stx-integ-filesystem/stx-integ-filesystem.inc

@@ -1,2 +0,0 @@
-inherit externalsrc
-EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ/"

recipes-core/stx-integ-kubernetes/stx-integ-kubernetes.inc

@@ -1,2 +0,0 @@
-inherit externalsrc
-EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ/"

recipes-core/stx-integ-puppet/stx-integ-config-files.inc

@@ -1,2 +0,0 @@
-inherit externalsrc
-EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ/"

recipes-core/stx-integ/base/cgcs-users.inc

@@ -0,0 +1,41 @@
+PACKAGES += " cgcs-users"
+
+RDEPENDS_cgcs-users_append = " bash"
+
+do_configure_append () {
+	:
+} 
+
+do_compile_append () {
+	cd ${S}/base/cgcs-users/cgcs-users-1.0
+	oe_runmake -e ibsh
+}
+
+do_install_append () {
+	cd ${S}/base/cgcs-users/cgcs-users-1.0
+	# oe_runmake -e DESTDIR=${D} ibsh_install
+	install -d -m 755 ${D}/${sysconfdir}/ibsh/cmds
+	install -d -m 755 ${D}/${sysconfdir}/ibsh/xtns
+	install -d -m 755 ${D}/${bindir}
+	cp globals.cmds ${D}/${sysconfdir}/ibsh/
+	cp globals.xtns ${D}/${sysconfdir}/ibsh/
+	cp admin.cmds ${D}/${sysconfdir}/ibsh/cmds/
+	cp admin.xtns ${D}/${sysconfdir}/ibsh/xtns/
+	cp operator.cmds ${D}/${sysconfdir}/ibsh/cmds/
+	cp operator.xtns ${D}/${sysconfdir}/ibsh/xtns/
+	cp secadmin.cmds ${D}/${sysconfdir}/ibsh/cmds/
+	cp secadmin.xtns ${D}/${sysconfdir}/ibsh/xtns/
+	install -p -m 755 ibsh ${D}/${bindir}
+}
+
+FILES_cgcs-users = " \
+	${sysconfdir}/ibsh/globals.cmds \
+	${sysconfdir}/ibsh/globals.xtns \
+	${sysconfdir}/ibsh/cmds/secadmin.cmds \
+	${sysconfdir}/ibsh/cmds/operator.cmds \
+	${sysconfdir}/ibsh/cmds/admin.cmds \
+	${sysconfdir}/ibsh/xtns/operator.xtns \
+	${sysconfdir}/ibsh/xtns/admin.xtns \
+	${sysconfdir}/ibsh/xtns/secadmin.xtns \
+	${bindir}/ibsh \
+	"

recipes-core/stx-integ/base/dhcp-config.inc

@@ -0,0 +1,25 @@
+PACKAGES += " dhcp-config"
+
+# TODO: Needs to be a bbappend
+
+RDEPENDS_dhcp-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/dhcp-config
+	install -d -m 0755 ${D}/${sysconfdir}/dhcp
+	install -p -m 0755 files/dhclient-enter-hooks ${D}/${sysconfdir}/dhcp/stx-dhclient-enter-hooks
+	install -p -m 0755 files/dhclient.conf ${D}/${sysconfdir}/dhcp/stx-dhclient.conf
+}
+
+FILES_dhcp-config = " \
+	${sysconfdir}/dhcp/stx-dhclient-enter-hooks \
+	${sysconfdir}/dhcp/stx-dhclient.conf \
+	"

recipes-core/stx-integ/base/dnsmasq-config.inc

@@ -0,0 +1,21 @@
+PACKAGES += " dnsmasq-config"
+
+RDEPENDS_dnsmasq-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/dnsmasq-config
+	install -d -m 0755 ${D}/${sysconfdir}/init.d
+	install -p -m 0755 files/init ${D}/${sysconfdir}/init.d/stx-dnsmasq
+}
+
+FILES_dnsmasq-config = " \
+	${sysconfdir}/init.d/stx-dnsmasq \
+	"

recipes-core/stx-integ/base/haproxy-config.inc

@@ -0,0 +1,27 @@
+PACKAGES += " haproxy-config"
+
+RDEPENDS_haproxy-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/haproxy-config
+	install -d -m 0755 ${D}/${systemd_system_unitdir}
+	install -d -m 0755 ${D}/${sysconfdir}/haproxy/errors
+	install -d -m 0755 ${D}/${sysconfdir}/init.d
+	install -p -m 0755 files/503.http ${D}/${sysconfdir}/haproxy/errors
+	install -p -m 0644 files/haproxy.service ${D}/${systemd_system_unitdir}
+	install -p -m 0755 files/haproxy.sh ${D}/${sysconfdir}/init.d
+}
+
+FILES_haproxy-config = " \
+	${sysconfdir}/haproxy/errors/503.http \
+	${systemd_system_unitdir}/haproxy.service \
+	${sysconfdir}/init.d/haproxy.sh \
+	"

recipes-core/stx-integ/base/initscripts-config.inc

@@ -0,0 +1,33 @@
+PACKAGES += " initscripts-config"
+
+RDEPENDS_initscripts-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/initscripts-config
+	install -d -m 0755 ${D}/${datadir}/starlingx/
+	install -d -m 0755 ${D}/${sysconfdir}/sysconfig
+	install -d -m 0755 ${D}/${sysconfdir}/init.d
+	install -d -m 0755 ${D}/${systemd_system_unitdir}
+	install -d -m 0755 ${D}/${sysconfdir}/sysconfig/network
+
+	install -p -m 0644 files/sysctl.conf ${D}/${datadir}/starlingx/stx.sysctl.conf
+	install -p -m 0644 files/sysconfig-network.conf ${D}/${sysconfdir}/sysconfig/network/
+	install -p -m 0755 files/mountnfs.sh ${D}/${sysconfdir}/init.d/mountnfs
+	install -p -m 0644 files/mountnfs.service ${D}/${systemd_system_unitdir}/mountnfs.service
+}
+
+FILES_initscripts-config = " \
+	${datadir}/starlingx/stx.sysctl.conf \
+	${sysconfdir}/sysconfig/network/sysconfig-network.conf \
+	${sysconfdir}/init.d/mountnfs \
+	${systemd_system_unitdir}/mountnfs.service \
+	"
+		

recipes-core/stx-integ/base/lighttpd-config.inc

@@ -0,0 +1,43 @@
+PACKAGES += " lighttpd-config"
+
+RDEPENDS_lighttpd-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/lighttpd-config
+	install -d -m 1777 ${D}/www/tmp
+	install -d ${D}/${sysconfdir}/lighttpd/ssl
+	install -d ${D}/www/pages/dav
+	install -d ${D}/${datadir}/starlingx
+
+	install -m640 files/lighttpd.conf ${D}/${datadir}/starlingx/lighttpd.conf
+	install -m755 files/lighttpd.init ${D}/${datadir}/starlingx/lighttpd.init
+	install -m644 files/lighttpd-inc.conf ${D}/${sysconfdir}/lighttpd/lighttpd-inc.conf
+	install -m644 files/index.html.lighttpd ${D}/www/pages/index.html
+	
+	# install -d ${D}/${sysconfdir}/logrotate.d
+	install -m644 files/lighttpd.logrotate ${D}/${datadir}/starlingx/lighttpd.logrotate
+	rm -rf ${D}/www/pages
+
+}
+
+# TODO:
+# This and other .inc packages need to be bbappends to avoid conflicts
+#	www/pages/index.html
+#	www/pages/dav 
+
+FILES_lighttpd-config = " \
+	${datadir}/starlingx/lighttpd.conf \
+	${datadir}/starlingx/lighttpd.init \
+	${datadir}/starlingx/lighttpd.logrotate \
+	${sysconfdir}/lighttpd/lighttpd-inc.conf \
+	${sysconfdir}/lighttpd/ssl \
+	www/tmp \
+	"

recipes-core/stx-integ/base/net-snmp-config.inc

@@ -0,0 +1,32 @@
+PACKAGES += " net-snmp-config"
+
+RDEPENDS_net-snmp-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/net-snmp-config
+	install -d ${D}/${datadir}/starlingx
+	install -d ${D}/${datadir}/snmp
+	install -d ${D}/${sysconfdir}/rc.d/init.d
+	install -d ${D}/${systemd_system_unitdir}
+
+	install -m640 files/stx.snmpd.conf ${D}/${datadir}/starlingx/stx.snmpd.conf
+	install -m755 files/stx.snmpd ${D}/${sysconfdir}/rc.d/init.d/stx-snmpd
+	install -m640 files/stx.snmp.conf ${D}/${datadir}/snmp/snmp.conf
+	install -m644 files/snmpd.service ${D}/${systemd_system_unitdir}/stx-snmpd.service
+
+}
+
+FILES_net-snmp-config = " \
+	${datadir}/starlingx/stx.snmpd.conf \
+	${sysconfdir}/rc.d/init.d/stx-snmpd \
+	${datadir}/snmp/snmp.conf \
+	${systemd_system_unitdir}/stx-snmpd.service \
+	"

recipes-core/stx-integ/base/openssh-config.inc

@@ -0,0 +1,30 @@
+PACKAGES += " openssh-config"
+
+RDEPENDS_openssh-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/openssh-config
+	install -d ${D}/${datadir}/starlingx
+	install -d ${D}/${systemd_system_unitdir}
+
+	install -m640 files/sshd.pam ${D}/${datadir}/starlingx/sshd.pam
+	install -m640 files/sshd_config ${D}/${datadir}/starlingx/sshd_config
+	install -m640 files/ssh_config ${D}/${datadir}/starlingx/ssh_config
+	install -m644 files/sshd.service ${D}/${systemd_system_unitdir}/sshd.service
+
+}
+
+FILES_openssh-config_append += " \
+	${datadir}/starlingx/sshd.pam \
+	${datadir}/starlingx/sshd_config \
+	${datadir}/starlingx/ssh_config \
+	${systemd_system_unitdir}/sshd.service \
+	"

recipes-core/stx-integ/base/setup-config.inc

@@ -0,0 +1,29 @@
+PACKAGES += " setup-config"
+
+RDEPENDS_setup-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/setup-config
+	install -d ${D}/${datadir}/starlingx
+	install -d ${D}/${sysconfdir}/profile.d
+
+	install -m640 files/motd ${D}/${datadir}/starlingx/stx.motd
+	install -m640 files/prompt.sh ${D}/${sysconfdir}/profile.d/prompt.sh
+	install -m640 files/custom.sh ${D}/${sysconfdir}/profile.d/custom.sh
+
+}
+
+FILES_setup-config = " \
+	${datadir}/starlingx/stx.motd \
+	${sysconfdir}/profile.d/prompt.sh \
+	${sysconfdir}/profile.d/custom.sh \
+	"
+		

recipes-core/stx-integ/base/systemd-config.inc

@@ -0,0 +1,31 @@
+PACKAGES += " systemd-config"
+
+RDEPENDS_systemd-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/base/systemd-config
+	install -d ${D}/${datadir}/starlingx
+
+	install -m644 files/60-persistent-storage.rules ${D}/${datadir}/starlingx/60-persistent-storage.rules
+	install -m644 files/journald.conf ${D}/${datadir}/starlingx/journald.conf
+	install -m644 files/systemd.conf.tmpfiles.d ${D}/${datadir}/starlingx/
+	install -m644 files/tmp.conf.tmpfiles.d ${D}/${datadir}/starlingx/
+	install -m644 files/tmp.mount ${D}/${datadir}/starlingx/
+
+}
+
+FILES_systemd-config = " \
+	${datadir}/starlingx/60-persistent-storage.rules \
+	${datadir}/starlingx/journald.conf \
+	${datadir}/starlingx/systemd.conf.tmpfiles.d \
+	${datadir}/starlingx/tmp.conf.tmpfiles.d \
+	${datadir}/starlingx/tmp.mount \
+	"

recipes-core/stx-integ/cgcs-users.bb

@@ -1,34 +0,0 @@
-DESCRIPTION = "cgcs-users"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	cd ${S}/base/cgcs-users/cgcs-users-1.0
-	oe_runmake -e ibsh
-}
-
-do_install () {
-	cd ${S}/base/cgcs-users/cgcs-users-1.0
-	oe_runmake -e DESTDIR=${D} ibsh_install
-}
-
-# FILES_${PN}_append += " "ibsh

recipes-core/stx-integ/config-files/audit-config.inc

@@ -0,0 +1,22 @@
+PACKAGES += " audit-config"
+
+RDEPENDS_audit-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/audit-config
+	install -d -m 0755 ${D}/${datadir}/starlingx/
+	install -p -m 0644 files/syslog.conf ${D}/${datadir}/starlingx/syslog.conf
+}
+
+FILES_audit-config = " \
+	${datadir}/starlingx/syslog.conf \
+	"
+		

recipes-core/stx-integ/config-files/docker-config.inc

@@ -0,0 +1,25 @@
+PACKAGES += " docker-config"
+
+RDEPENDS_docker-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/docker-config/files
+	oe_runmake -e DATADIR=${D}/${datadir} \
+		SYSCONFDIR=${D}/${sysconfdir} install
+}
+
+FILES_docker-config = " \
+	${sysconfdir}/pmon.d/docker.conf \
+	${sysconfdir}/systemd/system \
+	${sysconfdir}/systemd/system/docker.service.d \
+	${sysconfdir}/systemd/system/docker.service.d/docker-stx-override.conf \
+	${sysconfdir}/logrotate.d/docker.logrotate \
+	"

recipes-core/stx-integ/config-files/io-scheduler.inc

@@ -0,0 +1,21 @@
+PACKAGES += " io-scheduler"
+
+RDEPENDS_io-scheduler += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	install -d -m 0755 ${D}/${sysconfdir}/udev/rules.d
+	install -m644 ${S}/config-files/io-scheduler/centos/files/60-io-scheduler.rules \
+		${D}/${sysconfdir}/udev/rules.d/60-io-scheduler.rules 
+}
+
+FILES_io-scheduler = " \
+	${sysconfdir}/udev/rules.d/60-io-scheduler.rules \
+	"

recipes-core/stx-integ/config-files/iptables-config.inc

@@ -0,0 +1,30 @@
+PACKAGES += " iptables-config"
+
+RDEPENDS_iptables-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/iptables-config 
+	install -d -m0755 ${D}/${sysconfdir}/sysconfig
+	install -d -m0755 ${D}/${datadir}/starlingx
+
+	install -m600 files/iptables.rules ${D}/${datadir}/starlingx/iptables.rules
+	install -m600 files/ip6tables.rules ${D}/${datadir}/starlingx/ip6tables.rules
+
+	install -m600 files/iptables.rules ${D}/${sysconfdir}/sysconfig/iptables.rules
+	install -m600 files/ip6tables.rules ${D}/${sysconfdir}/sysconfig/ip6tables.rules
+}
+
+FILES_iptables-config = " \
+	${datadir}/starlingx/iptables.rules \
+	${datadir}/starlingx/ip6tables.rules \
+	${sysconfdir}/sysconfig/iptables.rules \
+	${sysconfdir}/sysconfig/ip6tables.rules \
+	"

recipes-core/stx-integ/config-files/memcached-custom.inc

@@ -0,0 +1,22 @@
+PACKAGES += " memcached-custom"
+
+RDEPENDS_memcached-custom = " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/memcached-custom
+	install -d -m0755 ${D}/${systemd_system_unitdir}
+
+	install -m644 files/memcached.service ${D}/${systemd_system_unitdir}/
+}
+
+FILES_memcached-custom = " \
+	${systemd_system_unitdir}/memcached.service \
+	"

recipes-core/stx-integ/config-files/ntp-config.inc

@@ -0,0 +1,25 @@
+PACKAGES += " ntp-config"
+
+RDEPENDS_ntp-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/ntp-config 
+	install -d -m0755 ${D}/${datadir}/starlingx
+
+	install -m644 files/ntp.conf ${D}/${datadir}/starlingx/ntp.config
+	install -m644 files/ntpd.sysconfig ${D}/${datadir}/starlingx/ntpd.sysconfig
+
+}
+
+FILES_ntp-config = " \
+	${datadir}/starlingx/ntp.config \
+	${datadir}/starlingx/ntpd.sysconfig \
+	"

recipes-core/stx-integ/config-files/pam-config.inc

@@ -1,31 +1,16 @@
-DESCRIPTION = "pam-config"
+PACKAGES += " pam-config"
 
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
+RDEPENDS_pam-config += " bash"
 
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
+do_configure_prepend () {
 	:
 } 
 
-do_compile() {
+do_compile_prepend () {
 	:
 }
 
-do_install () {
+do_install_prepend () {
 	cd ${S}/config-files/pam-config/
 	install -d -m0755 ${D}/${datadir}/starlingx
 	install -d -m0755 ${D}/${sysconfdir}/pam.d
@@ -39,4 +24,12 @@ do_install () {
 	install  -m 644 files/system-auth.pamd ${D}/${sysconfdir}/pam.d/system-auth
 }
 
-FILES_${PN}_append += " ${datadir} "
+FILES_pam-config = " \
+	${sysconfdir}/pam.d/common-account \
+	${sysconfdir}/pam.d/common-auth \
+	${sysconfdir}/pam.d/common-password \
+	${sysconfdir}/pam.d/common-session \
+	${sysconfdir}/pam.d/common-session-noninteractive \
+	${datadir}/starlingx/stx.system-auth \
+	${sysconfdir}/pam.d/system-auth \
+	"

recipes-core/stx-integ/config-files/rsync-config.inc

@@ -0,0 +1,23 @@
+PACKAGES += " rsync-config"
+
+RDEPENDS_rsync-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/rsync-config/
+	install -d -m0755 ${D}/${datadir}/starlingx
+	install -d -m0755 ${D}/${sysconfdir}/
+
+	install  -m 644 files/rsyncd.conf ${D}/${datadir}/starlingx/stx.rsyncd.conf
+}
+
+FILES_rsync-config = " \
+	${datadir}/starlingx/stx.rsyncd.conf \
+	"

recipes-core/stx-integ/config-files/shadow-utils-config.inc

@@ -0,0 +1,28 @@
+PACKAGES += " shadow-utils-config"
+
+RDEPENDS_shadow-utils-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/shadow-utils-config 
+	install -d -m0755 ${D}/${datadir}/starlingx
+	install -d -m0755 ${D}/${sysconfdir}/init.d
+	install -d -m0755 ${D}/${systemd_system_unitdir}
+
+	install -m644 files/login.defs ${D}/${datadir}/starlingx/login.defs
+	install -m644 files/clear_shadow_locks.service ${D}/${systemd_system_unitdir}/
+	install -m644 files/login.defs ${D}/${sysconfdir}/login.defs
+}
+
+FILES_shadow-utils-config = " \
+	${datadir}/starlingx/login.defs \
+	${systemd_system_unitdir}/clear_shadow_locks.service \
+	${sysconfdir}/login.defs \
+	"

recipes-core/stx-integ/config-files/sudo-config.inc

@@ -1,4 +1,4 @@
-DESCRIPTION = "sudo-config"
+PACKAGES += " sudo-config"
 #
 #TODO:
 # Set the following in shadow file and add the user
@@ -14,32 +14,17 @@ DESCRIPTION = "sudo-config"
 # +++++++ Replace with the correct file.
 
 
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
+RDEPENDS_sudo-config += " bash"
 
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
+do_configure_prepend () {
 	:
 } 
 
-do_compile() {
+do_compile_prepend () {
 	:
 }
 
-do_install () {
+do_install_prepend () {
 	cd ${S}/config-files/sudo-config 
 	install -d -m755 ${D}/${sysconfdir}/sudoers.d
 
@@ -47,4 +32,6 @@ do_install () {
 	install -m644 files/wrs.sudo ${D}/${sysconfdir}/sudoers.d/sysadmin
 }
 
-# FILES_${PN}_append += " ${datadir} "
+FILES_sudo-config = "  \
+	${sysconfdir}/sudoers.d/sysadmin \
+	"

recipes-core/stx-integ/config-files/syslog-ng-config.inc

@@ -1,31 +1,16 @@
-DESCRIPTION = "syslog-ng-config"
+PACKAGES += " syslog-ng-config"
 
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
+RDEPENDS_syslog-ng-config += " bash"
 
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ-config-files.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
+do_configure_prepend () {
 	:
 } 
 
-do_compile() {
+do_compile_prepend () {
 	:
 }
 
-do_install () {
+do_install_prepend () {
 
 	cd ${S}/config-files/syslog-ng-config 
 	install -d -m755 ${D}/${datadir}/starlingx
@@ -46,7 +31,14 @@ do_install () {
 
 }
 
-FILES_${PN}_append += " \
-		${systemd_system_unitdir} \
-		${datadir} \
-		"
+FILES_syslog-ng-config = " \
+	${datadir}/starlingx/syslog-ng.conf \
+	${datadir}/starlingx/syslog-ng.logrotate \
+	${sysconfdir}/syslog-ng/remotelogging.conf \
+	${sbindir}/fm_event_syslogger \
+	${datadir}/starlingx/syslog-ng.service \
+	${sysconfdir}/syslog-ng/syslog-ng.conf \
+	${sysconfdir}/logrotate.d/syslog \
+	${systemd_system_unitdir}/syslog-ng.service \
+	${sysconfdir}/sysconfig/syslog-ng \
+	"

recipes-core/stx-integ/config-files/util-linux-config.inc

@@ -0,0 +1,27 @@
+PACKAGES += " util-linux-config"
+
+RDEPENDS_util-linux-config += " bash"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	:
+}
+
+do_install_prepend () {
+	cd ${S}/config-files/util-linux-config 
+	install -d -m0755 ${D}/${datadir}/starlingx
+	install -d -m0755 ${D}/${sysconfdir}/pam.d
+
+	install -m644 files/stx.su ${D}/${datadir}/starlingx/stx.su
+	install -m644 files/stx.login ${D}/${datadir}/starlingx/stx.login
+
+}
+
+FILES_util-linux-config = " \
+	${datadir}/starlingx/stx.su \
+	${datadir}/starlingx/stx.login \
+	"
+

recipes-core/stx-integ/dhcp-config.bb

@@ -1,35 +0,0 @@
-DESCRIPTION = "dhcp-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/dhcp-config
-	install -d -m 0755 ${D}/${sysconfdir}/dhcp
-	install -p -m 0755 files/dhclient-enter-hooks ${D}/${sysconfdir}/dhcp
-	install -p -m 0755 files/dhclient.conf ${D}/${sysconfdir}/dhcp
-}
-
-# FILES_${PN}_append += " "

recipes-core/stx-integ/dnsmasq-config.bb

@@ -1,34 +0,0 @@
-DESCRIPTION = "dnsmasq-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/dnsmasq-config
-	install -d -m 0755 ${D}/${sysconfdir}/init.d
-	install -p -m 0755 files/init ${D}/${sysconfdir}/init.d/dnsmasq
-}
-
-# FILES_${PN}_append += " "

recipes-core/stx-integ/files/base/0002-Add-DESTDIR-CFLAGS-and-LDFLAGS.patch

@@ -0,0 +1,132 @@
+From edd5d4208db67d560afd3b5873b6ffc17fd5d79f Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Tue, 2 Jul 2019 14:29:52 -0700
+Subject: [PATCH 2/2] Add DESTDIR, CFLAGS and LDFLAGS.
+
+---
+ base/cgcs-users/cgcs-users-1.0/Makefile | 115 ++++++++++++------------
+ 1 file changed, 59 insertions(+), 56 deletions(-)
+
+diff --git a/base/cgcs-users/cgcs-users-1.0/Makefile b/base/cgcs-users/cgcs-users-1.0/Makefile
+index ed37d00..205f653 100644
+--- a/base/cgcs-users/cgcs-users-1.0/Makefile
++++ b/base/cgcs-users/cgcs-users-1.0/Makefile
+@@ -1,56 +1,59 @@
+-# This is the makefile for ibsh 0.3e
+-CC = gcc
+-OBJECTS = main.o command.o jail.o execute.o config.o misc.o antixploit.o delbadfiles.o
+-
+-ibsh: ${OBJECTS} ibsh.h
+-	${CC} -o ibsh ${OBJECTS}
+-
+-main.o: main.c ibsh.h
+-	${CC} -c main.c
+-
+-command.o: command.c ibsh.h
+-	${CC} -c command.c
+-
+-jail.o: jail.c ibsh.h
+-	${CC} -c jail.c
+-
+-execute.o: execute.c ibsh.h
+-	${CC} -c execute.c
+-
+-config.o: config.c ibsh.h
+-	${CC} -c config.c
+-
+-misc.o: misc.c ibsh.h
+-	${CC} -c misc.c
+-
+-antixploit.o: antixploit.c ibsh.h
+-	${CC} -c antixploit.c
+-
+-delbadfiles.o: delbadfiles.c ibsh.h
+-	${CC} -c delbadfiles.c
+-
+-ibsh_install:
+-	cp ./ibsh /bin/
+-	mkdir /etc/ibsh
+-	mkdir /etc/ibsh/cmds
+-	mkdir /etc/ibsh/xtns
+-	cp ./globals.cmds /etc/ibsh/
+-	cp ./globals.xtns /etc/ibsh/
+-
+-ibsh_uninstall:
+-	rm -rf /etc/ibsh/globals.cmds
+-	rm -rf /etc/ibsh/globals.xtns
+-	rm -rf /etc/ibsh/cmds/*.*
+-	rm -rf /etc/ibsh/xtns/*.*
+-	rmdir /etc/ibsh/cmds
+-	rmdir /etc/ibsh/xtns
+-	rmdir /etc/ibsh
+-	rm -rf /bin/ibsh
+-
+-clean:
+-	rm -rf ibsh
+-	rm -rf *.o
+-
+-
+-# 13:49 2005.04.06.
+-
++# This is the makefile for ibsh 0.3e
++CC = gcc
++OBJECTS = main.o command.o jail.o execute.o config.o misc.o antixploit.o delbadfiles.o
++
++ibsh: ${OBJECTS} ibsh.h
++	${CC} ${CFLAGS} ${LDFLAGS} -o ibsh ${OBJECTS}
++
++main.o: main.c ibsh.h
++	${CC} ${CFLAGS} -c main.c
++
++command.o: command.c ibsh.h
++	${CC} ${CFLAGS} -c command.c
++
++jail.o: jail.c ibsh.h
++	${CC} ${CFLAGS} -c jail.c
++
++execute.o: execute.c ibsh.h
++	${CC} ${CFLAGS} -c execute.c
++
++config.o: config.c ibsh.h
++	${CC} ${CFLAGS} -c config.c
++
++misc.o: misc.c ibsh.h
++	${CC} ${CFLAGS} -c misc.c
++
++antixploit.o: antixploit.c ibsh.h
++	${CC} ${CFLAGS} -c antixploit.c
++
++delbadfiles.o: delbadfiles.c ibsh.h
++	${CC} -c delbadfiles.c
++
++ibsh_install:
++	install -d 0755 ${DESTDIR}/bin
++	install -d 0755 ${DESTDIR}/etc/cmds
++	install -d 0755 ${DESTDIR}/etc/xtns
++	cp ./ibsh ${DESTDIR}/bin/
++	mkdir ${DESTDIR}/etc/ibsh
++	mkdir ${DESTDIR}/etc/ibsh/cmds
++	mkdir ${DESTDIR}/etc/ibsh/xtns
++	cp ./globals.cmds ${DESTDIR}/etc/ibsh/
++	cp ./globals.xtns ${DESTDIR}/etc/ibsh/
++
++ibsh_uninstall:
++	rm -rf ${DESTDIR}/etc/ibsh/globals.cmds
++	rm -rf ${DESTDIR}/etc/ibsh/globals.xtns
++	rm -rf ${DESTDIR}/etc/ibsh/cmds/*.*
++	rm -rf ${DESTDIR}/etc/ibsh/xtns/*.*
++	rmdir ${DESTDIR}/etc/ibsh/cmds
++	rmdir ${DESTDIR}/etc/ibsh/xtns
++	rmdir ${DESTDIR}/etc/ibsh
++	rm -rf ${DESTDIR}/bin/ibsh
++
++clean:
++	rm -rf ibsh
++	rm -rf *.o
++
++
++# 13:49 2005.04.06.
++
+-- 
+2.17.1
+

recipes-core/stx-integ/files/puppet-modules/0001-TIS-Patches.patch

@@ -0,0 +1,377 @@
+From 95c0ec5cb26efbe2c5dbf45df21518d8d1776be0 Mon Sep 17 00:00:00 2001
+From: Don Penney <don.penney@windriver.com>
+Date: Wed, 4 Jan 2017 12:15:53 -0500
+Subject: [PATCH] TIS Patches
+
+This patch rolls up the previous TIS patches, which includes:
+1. CGTS-4787 Set DRBD service ensure parameter
+
+2. Updates to fix DRBD resync-rate and engineered parameters:
+
+There are several DRBD performance related parameters that must be set to
+get reasonable resync performance, otherwise default resync throughput
+is limited to 40MB/s.  Note that user community has noted this limit
+when they use default settings, or up-rev DRBD from 8.3, etc.  Eg. they
+realize they hit this limit despite having 10G link or better and faster
+disks.
+
+The following parameters were added to puppet-drbd module for resource
+file generation, in addition to: c-plan-ahead, c-fill-target, c-min-rate,
+c-max-rate, currently engineered for dynamic resync-rates.
+
+disk section:
+- 'resync-rate' (aka 'rate') was missed in the CentOS port from Kilo
+- 'al-extents' set to 3389, set to a prime number. Increasing this improves
+  random write throughput. Could set a bit higher, but would need a study.
+
+net section:
+- 'max-buffers' engineered to scale with supported MBps, setting too low
+  (eg., default setting) is a bottleneck on 10G link.  Set this to
+  maximum settable value of 20000.  Note this parm may be settable to
+  larger values in more current DRBD rev. If we need to support faster
+  disks, likely need to increase this proportionately.
+- 'max-epoch-size' also set to 20000. DRBD tuning recommendation page
+  sets this the same as max-buffers.
+- 'unplug-watermark' set to 16 based on DRBD tuning recommendations page
+- 'sndbuf-size' set to 0 to auto-tune; historically default was too small
+- 'rcvbuf-size' set to 0 to auto-tune
+---
+ manifests/init.pp                            | 11 ++--
+ manifests/resource.pp                        | 93 +++++++++++++++++++++++++---
+ manifests/resource/up.pp                     |  2 +-
+ manifests/service.pp                         |  2 +-
+ templates/header.res.erb                     | 53 ++++++++++++++--
+ templates/primary-resource.res.erb           |  2 +-
+ templates/primary-stacked-resource.res.erb   |  2 +-
+ templates/resource.res.erb                   |  2 +-
+ templates/secondary-resource.res.erb         |  2 +-
+ templates/secondary-stacked-resource.res.erb |  2 +-
+ 10 files changed, 148 insertions(+), 23 deletions(-)
+
+diff --git a/manifests/init.pp b/manifests/init.pp
+index 09f7d48..76ce9c9 100644
+--- a/manifests/init.pp
++++ b/manifests/init.pp
+@@ -6,7 +6,8 @@
+ #
+ class drbd(
+   $service_enable = true,
+-  $package_name = 'drbd8-utils',
++  $service_ensure = 'running',
++  $package_name = 'drbd-utils',
+ ) {
+   include ::drbd::service
+ 
+@@ -22,7 +23,7 @@ class drbd(
+   }
+ 
+   File {
+-    mode    => '0644',
++    mode    => '0640',
+     owner   => 'root',
+     group   => 'root',
+     require => Package['drbd'],
+@@ -45,8 +46,10 @@ class drbd(
+   # only allow files managed by puppet in this directory.
+   file { '/etc/drbd.d':
+     ensure  => directory,
+-    mode    => '0644',
+-    purge   => true,
++    mode    => '0640',
++    # Set purge to false so that it does not clear the dir
++    # when the 2nd drbd resource is added.
++    purge   => false,
+     recurse => true,
+     force   => true,
+     require => Package['drbd'],
+diff --git a/manifests/resource.pp b/manifests/resource.pp
+index af2ff77..10edc1a 100644
+--- a/manifests/resource.pp
++++ b/manifests/resource.pp
+@@ -22,6 +22,10 @@
+ #  [ha_primary] If the resource is being applied on the primary host.
+ #  [initial_setup] If this run is associated with the initial setup. Allows a user
+ #    to only perform dangerous setup on the initial run.
++#  [link_util] replication link network utilization percent
++#  [link_speed] replication link network speed mbps
++#  [num_parallel] number of parallel drbd filesystems to sync
++#  [rtt_ms] round-trip-time milliseconds (i.e., ping between replication nodes)
+ define drbd::resource (
+   $host1          = undef,
+   $host2          = undef,
+@@ -39,7 +43,10 @@ define drbd::resource (
+   $group          = 'root',
+   $protocol       = 'C',
+   $verify_alg     = 'crc32c',
+-  $rate           = false,
++  $link_util      = false,
++  $link_speed     = false,
++  $num_parallel   = false,
++  $rtt_ms         = false,
+   $net_parameters = false,
+   $manage         = true,
+   $ha_primary     = false,
+@@ -47,6 +54,7 @@ define drbd::resource (
+   $fs_type        = 'ext4',
+   $mkfs_opts      = '',
+   $disk           = undef,
++  $handlers       = false,
+ ) {
+   include ::drbd
+ 
+@@ -67,6 +75,75 @@ define drbd::resource (
+     group  => $group,
+   }
+ 
++  if $link_util and $link_speed and $num_parallel and $rtt_ms {
++    # Engineer drbd variable sync rate parameters based on the following:
++    #  https://blogs.linbit.com/p/128/drbd-sync-rate-controller/
++    #  https://blogs.linbit.com/p/443/drbd-sync-rate-controller-2/
++    # Methodology adapted to account for replication link speed and parallelism.
++
++    # Since there is no aggregate bandwidth control, prorate the drbd
++    # replication bandwidth based on parallelism.
++    # Based on experimentation, it seems generally better to set num_parallel
++    # to 1 and let DRBD auto-regulate its throughput.  The end result is that
++    # multiple competing filesystems (i.e., on same disk device) already have
++    # their sync throughput reduced.
++    $mbps = $link_speed / $num_parallel
++
++    # bandwidth delay product
++    $bdp_k = $mbps * $rtt_ms
++
++    # engineer initial sync rate as percent of link bandwidth
++    $rate_M = floor($link_util * $mbps / 8 / 100)
++    $rate = "${rate_M}M"
++
++    # engineer c_plan_ahead to default value (tenths)
++    # Documentation indicates this value OK even for 200 ms RTT.
++    $c_plan_ahead = 20
++
++    # engineer c_fill_target as 1*BDP (tune within 1x to 3x BDP;
++    # choose minimum value that saturates bandwidth)
++    $fill_target_k = floor(1 * $bdp_k)
++    $c_fill_target = "${fill_target_k}k"
++
++    # engineer c_min_rate -- experimentally determined so DRBD is not
++    # throttled to a crawl even when there is minimal application IO.
++    # DRBD default is way too small.
++    $min_rate_M = 15 + floor($link_util * $mbps / 8 / 100 / 25)
++    $c_min_rate = "${min_rate_M}M"
++
++    # engineer c_max_rate as percent of link bandwidth
++    $max_rate_M = floor($link_util * $mbps / 8 / 100)
++    $c_max_rate = "${max_rate_M}M"
++
++    # various tuning settings to enable larger link bandwidth (eg, 10G)
++    # max_buffers should scale with MBps; set to maximum settable
++    $max_buffers = 20000
++    $max_epoch_size = 20000
++    $unplug_watermark = 16
++    # sndbuf_size and rcvbuf_size should scale with mbps; set 0 to auto-tune
++    $sndbuf_size = 0
++    $rcvbuf_size = 0
++    # increase al_extents to improve random write throughput; set to prime number
++    $al_extents = 3389
++  } else {
++    # disable variable sync rate
++    $c_plan_ahead  = 0
++    $c_fill_target = false
++    $c_min_rate    = false
++    $c_max_rate    = false
++
++    # engineer fixed sync rate at 40 percent of 1G
++    $rate_M = floor(40 * 1000 / 8 / 100)
++    $rate = "${rate_M}M"
++
++    $max_buffers = false
++    $max_epoch_size = false
++    $unplug_watermark = false
++    $sndbuf_size = false
++    $rcvbuf_size = false
++    $al_extents = false
++  }
++
+   concat { "/etc/drbd.d/${name}.res":
+     mode    => '0600',
+     require => [
+@@ -94,13 +171,13 @@ define drbd::resource (
+   }
+   # Export our fragment for the clustered node
+   if $ha_primary and $cluster {
+-    @@concat::fragment { "${name} ${cluster} primary resource":
++    concat::fragment { "${name} ${cluster} primary resource":
+       target  => "/etc/drbd.d/${name}.res",
+       content => template('drbd/resource.res.erb'),
+       order   => '10',
+     }
+   } elsif $cluster {
+-    @@concat::fragment { "${name} ${cluster} secondary resource":
++    concat::fragment { "${name} ${cluster} secondary resource":
+       target  => "/etc/drbd.d/${name}.res",
+       content => template('drbd/resource.res.erb'),
+       order   => '20',
+@@ -137,11 +214,11 @@ define drbd::resource (
+     order   => '99',
+   }
+ 
+-  if $cluster {
+-    # Import cluster nodes
+-    Concat::Fragment <<| title == "${name} ${cluster} primary resource" |>>
+-    Concat::Fragment <<| title == "${name} ${cluster} secondary resource" |>>
+-  }
++#  if $cluster {
++#    # Import cluster nodes
++#    Concat::Fragment <<| title == "${name} ${cluster} primary resource" |>>
++#    Concat::Fragment <<| title == "${name} ${cluster} secondary resource" |>>
++#  }
+ 
+   # Due to a bug in puppet, defined() conditionals must be in a defined
+   # resource to be evaluated *after* the collector instead of before.
+diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
+index 7668792..b626f55 100644
+--- a/manifests/resource/up.pp
++++ b/manifests/resource/up.pp
+@@ -70,7 +70,7 @@ define drbd::resource::up (
+       # ensure that the device is mounted
+       mount { $mountpoint:
+         ensure  => mounted,
+-        atboot  => false,
++        atboot  => yes,
+         device  => $device,
+         fstype  => 'auto',
+         options => 'defaults,noauto',
+diff --git a/manifests/service.pp b/manifests/service.pp
+index de56b34..f9b217a 100644
+--- a/manifests/service.pp
++++ b/manifests/service.pp
+@@ -1,6 +1,6 @@
+ class drbd::service {
+   @service { 'drbd':
+-    ensure  => running,
++    ensure  => $drbd::service_ensure,
+     enable  => $drbd::service_enable,
+     require => Package['drbd'],
+     restart => 'service drbd reload',
+diff --git a/templates/header.res.erb b/templates/header.res.erb
+index 2d785c4..a3256a3 100644
+--- a/templates/header.res.erb
++++ b/templates/header.res.erb
+@@ -5,7 +5,32 @@ resource <%= @name %> {
+   disk      <%= @disk %>;
+   meta-disk internal;
+ 
++  disk {
++<% if @rate -%>
++    resync-rate <%= @rate %>;
++<% end -%>
++<% if @c_plan_ahead -%>
++    c-plan-ahead <%= @c_plan_ahead %>;
++<% end -%>
++<% if @c_fill_target -%>
++    c-fill-target <%= @c_fill_target %>;
++<% end -%>
++<% if @c_min_rate -%>
++    c-min-rate <%= @c_min_rate %>;
++<% end -%>
++<% if @c_max_rate -%>
++    c-max-rate <%= @c_max_rate %>;
++<% end -%>
++<% if @al_extents -%>
++    al-extents <%= @al_extents %>;
++<% end -%>
++  }
++
+   net {
++    after-sb-0pri discard-zero-changes;
++    after-sb-1pri discard-secondary;
++    after-sb-2pri disconnect;
++
+     cram-hmac-alg sha1;
+ <% if @secret -%>
+     shared-secret "<%= @secret %>";
+@@ -16,12 +41,32 @@ resource <%= @name %> {
+     <%= k %> <%= v %>;
+ <% end -%>
+ <% end -%>
+-  }
+ 
+-  syncer {
++<% if @max_buffers -%>
++    max-buffers <%= @max_buffers %>;
++<% end -%>
++<% if @max_epoch_size -%>
++    max-epoch-size <%= @max_epoch_size %>;
++<% end -%>
++<% if @unplug_watermark -%>
++    unplug-watermark <%= @unplug_watermark %>;
++<% end -%>
++<% if @sndbuf_size -%>
++    sndbuf-size <%= @sndbuf_size %>;
++<% end -%>
++<% if @rcvbuf_size -%>
++    rcvbuf-size <%= @rcvbuf_size %>;
++<% end -%>
++<% if @verify_alg -%>
+     verify-alg <%= @verify_alg %>;
+-<% if @rate -%>
+-    rate <%= @rate %>;
+ <% end -%>
+   }
+ 
++<% if @handlers -%>
++  handlers {
++<% @handlers.sort_by {|k, v| k}.each do |k, v| -%>
++    <%= k %> "<%= v %>";
++<% end -%>
++  }
++<% end -%>
++
+diff --git a/templates/primary-resource.res.erb b/templates/primary-resource.res.erb
+index f8af77e..6032fd2 100644
+--- a/templates/primary-resource.res.erb
++++ b/templates/primary-resource.res.erb
+@@ -1,3 +1,3 @@
+   on <%= @host1 %> {
+-    address <%= @ip1 %>:<%= @port %>;
++    address <%= IPAddr.new(@ip1).ipv6?() ? "ipv6 ["+@ip1+"]:"+@port : "ipv4 "+@ip1+":"+@port %>;
+   }
+diff --git a/templates/primary-stacked-resource.res.erb b/templates/primary-stacked-resource.res.erb
+index 7eb4dad..a22d8b3 100644
+--- a/templates/primary-stacked-resource.res.erb
++++ b/templates/primary-stacked-resource.res.erb
+@@ -1,3 +1,3 @@
+   stacked-on-top-of <%= @res1 %> {
+-    address <%= @ip1 %>:<%= @port %>;
++    address <%= IPAddr.new(ip1).ipv6?() ? "ipv6 ["+ip1+"]:"+port : "ipv4 "+ip1+":"+port %>;
+   }
+diff --git a/templates/resource.res.erb b/templates/resource.res.erb
+index 047877e..9dd4c4d 100644
+--- a/templates/resource.res.erb
++++ b/templates/resource.res.erb
+@@ -1,3 +1,3 @@
+   on <%= @hostname %> {
+-    address <%= @ipaddress %>:<%= @port %>;
++    address <%= IPAddr.new(ipaddress).ipv6?() ? "ipv6 ["+ipaddress+"]:"+@port : "ipv4 "+ipaddress+":"+port %>;
+   }
+diff --git a/templates/secondary-resource.res.erb b/templates/secondary-resource.res.erb
+index 678640a..cf2fd96 100644
+--- a/templates/secondary-resource.res.erb
++++ b/templates/secondary-resource.res.erb
+@@ -1,3 +1,3 @@
+   on <%= @host2 %> {
+-    address <%= @ip2 %>:<%= @port %>;
++    address <%= IPAddr.new(@ip2).ipv6?() ? "ipv6 ["+@ip2+"]:"+@port : "ipv4 "+@ip2+":"+@port %>;
+   }
+diff --git a/templates/secondary-stacked-resource.res.erb b/templates/secondary-stacked-resource.res.erb
+index 409a705..87d28f5 100644
+--- a/templates/secondary-stacked-resource.res.erb
++++ b/templates/secondary-stacked-resource.res.erb
+@@ -1,3 +1,3 @@
+   stacked-on-top-of <%= @res2 %> {
+-    address <%= @ip2 %>:<%= @port %>;
++    address <%= IPAddr.new(ip2).ipv6?() ? "ipv6 ["+ip2+"]:"+port : "ipv4 "+ip2+":"+port %>;
+   }
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0002-Disable-timeout-for-mkfs-command.patch

@@ -0,0 +1,24 @@
+From 0c36ecaef39328e85f41ebe8164dc7da5949542a Mon Sep 17 00:00:00 2001
+From: Don Penney <don.penney@windriver.com>
+Date: Tue, 11 Apr 2017 11:14:25 -0400
+Subject: [PATCH] Disable timeout for mkfs command
+
+---
+ manifests/resource/up.pp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
+index b626f55..f9de8ab 100644
+--- a/manifests/resource/up.pp
++++ b/manifests/resource/up.pp
+@@ -54,6 +54,7 @@ define drbd::resource::up (
+       }
+       exec { "drbd_format_volume_${name}":
+         command     => "mkfs.${fs_type} ${mkfs_opts} ${device}",
++        timeout     => 0,
+         refreshonly => true,
+         require     => Exec["drbd_make_primary_${name}"],
+         before      => $before,
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0003-drbd-parallel-to-serial-synchronization.patch

@@ -0,0 +1,39 @@
+From a1186e3f68a338c575acdcf5cf41728a1b9ba2c1 Mon Sep 17 00:00:00 2001
+From: Angie Wang <angie.Wang@windriver.com>
+Date: Mon, 29 May 2017 10:20:13 -0400
+Subject: [PATCH 1/1] drbd-parallel-to-serial-synchronization
+
+---
+ manifests/resource.pp    | 1 +
+ templates/header.res.erb | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/manifests/resource.pp b/manifests/resource.pp
+index 10edc1a..d19ad8b 100644
+--- a/manifests/resource.pp
++++ b/manifests/resource.pp
+@@ -47,6 +47,7 @@ define drbd::resource (
+   $link_speed     = false,
+   $num_parallel   = false,
+   $rtt_ms         = false,
++  $resync_after   = undef,
+   $net_parameters = false,
+   $manage         = true,
+   $ha_primary     = false,
+diff --git a/templates/header.res.erb b/templates/header.res.erb
+index a3256a3..be53761 100644
+--- a/templates/header.res.erb
++++ b/templates/header.res.erb
+@@ -9,6 +9,9 @@ resource <%= @name %> {
+ <% if @rate -%>
+     resync-rate <%= @rate %>;
+ <% end -%>
++<% if @resync_after -%>
++    resync-after <%= @resync_after %>;
++<% end -%>
+ <% if @c_plan_ahead -%>
+     c-plan-ahead <%= @c_plan_ahead %>;
+ <% end -%>
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0004-US-96914-reuse-existing-drbd-cinder-resource.patch

@@ -0,0 +1,53 @@
+From 132fc324c633ee95ca9ac8d00fb27fe5c4df6a3a Mon Sep 17 00:00:00 2001
+From: Daniel Badea <daniel.badea@windriver.com>
+Date: Tue, 30 May 2017 21:52:52 +0000
+Subject: [PATCH] US-96914 reuse existing drbd-cinder resource
+
+Trying to initialize and enable DRBD resource fails in "drbdadm
+create-md" when the disk already contains meta data. In this case
+"drbdadm adjust" should be called.
+---
+ manifests/resource/up.pp | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
+index f9de8ab..160c8c2 100644
+--- a/manifests/resource/up.pp
++++ b/manifests/resource/up.pp
+@@ -14,7 +14,7 @@ define drbd::resource::up (
+   exec { "initialize DRBD metadata for ${name}":
+     command => "yes yes | drbdadm create-md ${name}",
+     onlyif  => "test -e ${disk}",
+-    unless  => "drbdadm dump-md ${name} || (drbdadm cstate ${name} | egrep -q '^(Sync|Connected|WFConnection|StandAlone|Verify)')",
++    unless  => "drbdadm dump-md ${name} || (drbdadm cstate ${name} | egrep -q '^(Sync|Connected|WFConnection|StandAlone|Verify)') || (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
+     before  => Service['drbd'],
+     require => [
+       Exec['modprobe drbd'],
+@@ -26,6 +26,7 @@ define drbd::resource::up (
+   exec { "enable DRBD resource ${name}":
+     command => "drbdadm up ${name}",
+     onlyif  => "drbdadm dstate ${name} | egrep -q '^(Diskless/|Unconfigured|Consistent)'",
++    unless  => "drbdadm show-gi ${name} | grep 'meta-data: need apply-al'",
+     before  => Service['drbd'],
+     require => [
+       Exec["initialize DRBD metadata for ${name}"],
+@@ -34,6 +35,16 @@ define drbd::resource::up (
+     notify  => Service['drbd'],
+   }
+ 
++  exec { "reuse existing DRBD resoure ${name}":
++    command => "drbdadm adjust ${name}",
++    onlyif  => "test -e ${disk} && (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
++    before  => Service['drbd'],
++    require => [
++      Exec['modprobe drbd'],
++      Concat["/etc/drbd.d/${name}.res"],
++    ],
++    notify  => Service['drbd'],
++  }
+ 
+   # these resources should only be applied if we are configuring the
+   # primary node in our HA setup
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0005-Add-PausedSync-states-to-acceptable-cstate.patch

@@ -0,0 +1,26 @@
+From b575f4c50e8726c5f9b3227b37a4517c0bbde85c Mon Sep 17 00:00:00 2001
+From: Robert Church <robert.church@windriver.com>
+Date: Fri, 2 Jun 2017 02:15:19 +0000
+Subject: [PATCH] Add PausedSync states to acceptable cstate to avoid metdata
+ creation
+
+---
+ manifests/resource/up.pp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
+index 160c8c2..3e2fdac 100644
+--- a/manifests/resource/up.pp
++++ b/manifests/resource/up.pp
+@@ -14,7 +14,7 @@ define drbd::resource::up (
+   exec { "initialize DRBD metadata for ${name}":
+     command => "yes yes | drbdadm create-md ${name}",
+     onlyif  => "test -e ${disk}",
+-    unless  => "drbdadm dump-md ${name} || (drbdadm cstate ${name} | egrep -q '^(Sync|Connected|WFConnection|StandAlone|Verify)') || (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
++    unless  => "drbdadm dump-md ${name} || (drbdadm cstate ${name} | egrep -q '^(PausedSync|Sync|Connected|WFConnection|StandAlone|Verify)') || (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
+     before  => Service['drbd'],
+     require => [
+       Exec['modprobe drbd'],
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0006-CGTS-7164-Add-resource-options-cpu-mask-to-affine-drbd-kernel-threads.patch

@@ -0,0 +1,68 @@
+From 0e264e7ac2b311aa9b42b183660a07b7e4e36b11 Mon Sep 17 00:00:00 2001
+From: Jim Gauld <james.gauld@windriver.com>
+Date: Fri, 9 Jun 2017 14:58:23 -0400
+Subject: [PATCH 1/1] CGTS-7164: Add resource options cpu-mask to affine drbd
+ kernel threads
+
+This adds "options { cpu-mask <cpumask>; }" section to DRBD resource
+configuration if 'cpumask' hexstring is defined. This governs kernel
+threads: drbd_w_<x>, drbd_r_<x>, drbd_a_<x>.
+
+Related notes:
+- if cpumask is not specified, the kernel threads drbd_w_<x>, drbd_r_<x>,
+  drbd_a_<x>, and drbd_as_<x> are affined to individual cores, each <x>
+  on a different core.
+
+- the remainder of the kernel threads are governed by kernel boot
+  argument kthread_cpus=<cpulist>.  i.e., drbd-reissue, drbd<x>_submit,
+  jbd2/drbd<x>-8, drbd_as_<x>.
+
+- the drbd_a_<x> and drbd_as_<x> show up when DRBD is duplex.
+
+- the drbd_a_<x> threads have SCHED_RR scheduling policy.
+---
+ manifests/resource.pp    | 3 +++
+ templates/header.res.erb | 6 ++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/manifests/resource.pp b/manifests/resource.pp
+index d19ad8b..17e6142 100644
+--- a/manifests/resource.pp
++++ b/manifests/resource.pp
+@@ -26,6 +26,8 @@
+ #  [link_speed] replication link network speed mbps
+ #  [num_parallel] number of parallel drbd filesystems to sync
+ #  [rtt_ms] round-trip-time milliseconds (i.e., ping between replication nodes)
++#  [cpumask] cpu-affinity-mask for DRBD kernel threads (hexidecimal notation).
++#    0 means spread over all CPUs of the machine.
+ define drbd::resource (
+   $host1          = undef,
+   $host2          = undef,
+@@ -48,6 +50,7 @@ define drbd::resource (
+   $num_parallel   = false,
+   $rtt_ms         = false,
+   $resync_after   = undef,
++  $cpumask        = false,
+   $net_parameters = false,
+   $manage         = true,
+   $ha_primary     = false,
+diff --git a/templates/header.res.erb b/templates/header.res.erb
+index be53761..df52544 100644
+--- a/templates/header.res.erb
++++ b/templates/header.res.erb
+@@ -29,6 +29,12 @@ resource <%= @name %> {
+ <% end -%>
+   }
+ 
++<% if @cpumask -%>
++  options {
++    cpu-mask <%= @cpumask %>;
++  }
++<% end -%>
++
+   net {
+     after-sb-0pri discard-zero-changes;
+     after-sb-1pri discard-secondary;
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0007-Add-disk-by-path-test.patch

@@ -0,0 +1,51 @@
+From 30ae8c86d9471980a0058823d6593e7548e19506 Mon Sep 17 00:00:00 2001
+From: Don Penney <don.penney@windriver.com>
+Date: Thu, 15 Jun 2017 17:34:30 -0400
+Subject: [PATCH] Add disk by-path test
+
+---
+ manifests/resource/up.pp | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
+index 3e2fdac..ea379a8 100644
+--- a/manifests/resource/up.pp
++++ b/manifests/resource/up.pp
+@@ -8,6 +8,17 @@ define drbd::resource::up (
+   $mountpoint,
+   $automount,
+ ) {
++
++  # Ensure disk by-path link exists
++  exec { "test disk by-path for ${name}":
++    command => "udevadm settle",
++    unless => "test -e ${disk}",
++    before => Service['drbd'],
++    require => [
++        Exec['modprobe drbd']
++      ],
++  }
++
+   # create metadata on device, except if resource seems already initalized.
+   # drbd is very tenacious about asking for aproval if there is data on the
+   # volume already.
+@@ -18,6 +29,7 @@ define drbd::resource::up (
+     before  => Service['drbd'],
+     require => [
+       Exec['modprobe drbd'],
++      Exec["test disk by-path for ${name}"],
+       Concat["/etc/drbd.d/${name}.res"],
+       ],
+     notify  => Service['drbd'],
+@@ -35,7 +47,7 @@ define drbd::resource::up (
+     notify  => Service['drbd'],
+   }
+ 
+-  exec { "reuse existing DRBD resoure ${name}":
++  exec { "reuse existing DRBD resource ${name}":
+     command => "drbdadm adjust ${name}",
+     onlyif  => "test -e ${disk} && (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
+     before  => Service['drbd'],
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0008-CGTS-7953-support-for-new-drbd-resources.patch

@@ -0,0 +1,40 @@
+From a29598365183c10e4650088675a6e3181b340187 Mon Sep 17 00:00:00 2001
+From: Kristine Bujold <kristine.bujold@windriver.com>
+Date: Wed, 17 Jan 2018 18:18:15 -0500
+Subject: [PATCH 1/1] foo bar
+
+---
+ manifests/init.pp                | 2 ++
+ templates/global_common.conf.erb | 5 +++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/manifests/init.pp b/manifests/init.pp
+index 76ce9c9..5e6bdc0 100644
+--- a/manifests/init.pp
++++ b/manifests/init.pp
+@@ -8,6 +8,8 @@ class drbd(
+   $service_enable = true,
+   $service_ensure = 'running',
+   $package_name = 'drbd-utils',
++  $wfc_timeout = 0,
++  $degr_wfc_timeout = 0,
+ ) {
+   include ::drbd::service
+ 
+diff --git a/templates/global_common.conf.erb b/templates/global_common.conf.erb
+index 921a637..0253ef3 100644
+--- a/templates/global_common.conf.erb
++++ b/templates/global_common.conf.erb
+@@ -3,4 +3,9 @@ global {
+ }
+ common {
+   protocol C;
++
++  startup {
++    wfc-timeout <%= @wfc_timeout %>;
++    degr-wfc-timeout <%= @degr_wfc_timeout %>;
++  }
+ }
+-- 
+1.8.3.1
+

recipes-core/stx-integ/files/puppet-modules/0009-drbd-slow-before-swact.patch

@@ -0,0 +1,25 @@
+From 2628193e8aef471caab27ada848fa8d7de6d93ec Mon Sep 17 00:00:00 2001
+From: Daniel Badea <daniel.badea@windriver.com>
+Date: Wed, 13 Jun 2018 14:16:53 +0000
+Subject: [PATCH] drbd slow before swact
+
+---
+ manifests/resource/up.pp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
+index c3557e1..11cf7ee 100644
+--- a/manifests/resource/up.pp
++++ b/manifests/resource/up.pp
+@@ -23,7 +23,7 @@ define drbd::resource::up (
+   # drbd is very tenacious about asking for aproval if there is data on the
+   # volume already.
+   exec { "initialize DRBD metadata for ${name}":
+-    command => "yes yes | drbdadm create-md ${name}",
++    command => "yes yes | drbdadm create-md ${name} -W--peer-max-bio-size=128k",
+     onlyif  => "test -e ${disk}",
+     unless  => "drbdadm dump-md ${name} || (drbdadm cstate ${name} | egrep -q '^(PausedSync|Sync|Connected|WFConnection|StandAlone|Verify)') || (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
+     before  => Service['drbd'],
+-- 
+1.8.3.1
+

recipes-core/stx-integ/haproxy-config.bb

@@ -1,38 +0,0 @@
-DESCRIPTION = "haproxy-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/haproxy-config
-	install -d -m 0755 ${D}/${systemd_system_unitdir}
-	install -d -m 0755 ${D}/${sysconfdir}/haproxy/errors
-	install -d -m 0755 ${D}/${sysconfdir}/init.d
-	install -p -m 0755 files/503.http ${D}/${sysconfdir}/haproxy/errors
-	install -p -m 0644 files/haproxy.service ${D}/${systemd_system_unitdir}
-	install -p -m 0755 files/haproxy.sh ${D}/${sysconfdir}/init.d
-}
-
-FILES_${PN}_append += " ${systemd_system_unitdir} "

recipes-core/stx-integ/initscripts-config.bb

@@ -1,45 +0,0 @@
-DESCRIPTION = "initscripts-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/initscripts-config
-	install -d -m 0755 ${D}/${datadir}/starlingx/
-	install -d -m 0755 ${D}/${sysconfdir}/sysconfig
-	install -d -m 0755 ${D}/${sysconfdir}/init.d
-	install -d -m 0755 ${D}/${systemd_system_unitdir}
-
-	install -p -m 0644 files/sysctl.conf ${D}/${datadir}/starlingx/stx.sysctl.conf
-	install -p -m 0644 files/sysconfig-network.conf ${D}/${sysconfdir}/sysconfig/network
-	install -p -m 0755 files/mountnfs.sh ${D}/${sysconfdir}/init.d/mountnfs
-	install -p -m 0644 files/mountnfs.service ${D}/${systemd_system_unitdir}/mountnfs.service
-}
-
-FILES_${PN}_append += " \
-	${systemd_system_unitdir} \
-	${datadir} \
-	"\
-		

recipes-core/stx-integ/lighttpd-config.bb

@@ -1,50 +0,0 @@
-DESCRIPTION = "lighttpd-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/lighttpd-config
-	install -d -m 1777 ${D}/www/tmp
-	install -d ${D}/${sysconfdir}/lighttpd/ssl
-	install -d ${D}/www/pages/dav
-	install -d ${D}/${datadir}/starlingx
-
-	install -m640 files/lighttpd.conf ${D}/${datadir}/starlingx/lighttpd.conf
-	install -m755 files/lighttpd.init ${D}/${datadir}/starlingx/lighttpd.init
-	install -m644 files/lighttpd-inc.conf ${D}/${sysconfdir}/lighttpd/lighttpd-inc.conf
-	install -m644 files/index.html.lighttpd ${D}/www/pages/index.html
-	
-	install -d ${D}/${sysconfdir}/logrotate.d
-	install -m644 files/lighttpd.logrotate ${D}/${datadir}/starlingx/lighttpd.logrotate
-
-}
-
-FILES_${PN}_append += " \
-	${systemd_system_unitdir} \
-	${datadir} \
-	www \
-	"
-		

recipes-core/stx-integ/net-snmp-config.bb

@@ -1,46 +0,0 @@
-DESCRIPTION = "net-snmp-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/net-snmp-config
-	install -d ${D}/${datadir}/starlingx
-	install -d ${D}/${datadir}/snmp
-	install -d ${D}/${sysconfdir}/rc.d/init.d
-	install -d ${D}/${systemd_system_unitdir}
-
-	install -m640 files/stx.snmpd.conf ${D}/${datadir}/starlingx/stx.snmpd.conf
-	install -m755 files/stx.snmpd ${D}/${sysconfdir}/rc.d/init.d/snmpd
-	install -m640 files/stx.snmp.conf ${D}/${datadir}/snmp/snmp.conf
-	install -m644 files/snmpd.service ${D}/${systemd_system_unitdir}/snpd.service
-
-}
-
-FILES_${PN}_append += " \
-	${systemd_system_unitdir} \
-	${datadir} \
-	"
-		

recipes-core/stx-integ/openssh-config.bb

@@ -1,44 +0,0 @@
-DESCRIPTION = "openssh-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/openssh-config
-	install -d ${D}/${datadir}/starlingx
-	install -d ${D}/${systemd_system_unitdir}
-
-	install -m640 files/sshd.pam ${D}/${datadir}/starlingx/sshd.pam
-	install -m640 files/sshd_config ${D}/${datadir}/starlingx/sshd_config
-	install -m640 files/ssh_config ${D}/${datadir}/starlingx/ssh_config
-	install -m644 files/sshd.service ${D}/${systemd_system_unitdir}/sshd.service
-
-}
-
-FILES_${PN}_append += " \
-	${systemd_system_unitdir} \
-	${datadir} \
-	"
-		

recipes-core/stx-integ/puppet-boolean_git.bb

@@ -0,0 +1,32 @@
+DESCRIPTION = " puppet-boolean"
+
+STABLE = "master"
+PROTOCOL = "https"
+BRANCH = "master"
+SRCREV = "22b726dd78b0a60a224cc7054aebbf28e9306f62"
+S = "${WORKDIR}/git"
+
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8cbd44f4ffbc81632df22fdd4ae87811"
+
+SRC_URI = "git://github.com/voxpupuli/puppet-boolean.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
+
+do_configure () {
+	:
+} 
+
+do_compile() {
+	:
+}
+
+do_install () {
+	cd ${S}/
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/boolean
+	cp -R * ${D}/${datadir}/puppet/modules/boolean/
+	# chown -R root:root ${D}/
+}
+
+FILES_${PN}_append += " \
+	${datadir}/puppet/modules/boolean/ \
+	"

recipes-core/stx-integ/puppet-create-resources_git.bb

@@ -0,0 +1,32 @@
+DESCRIPTION = "puppet-boolean"
+
+STABLE = "master"
+PROTOCOL = "https"
+BRANCH = "master"
+SRCREV = "4639819a7f3a4fa9310d2ba583c63e467df7e2c3"
+S = "${WORKDIR}/git"
+
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6089b6bd1f0d807edb8bdfd76da0b038 "
+
+SRC_URI = "git://github.com/puppetlabs/puppetlabs-create_resources.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
+
+do_configure () {
+	:
+} 
+
+do_compile() {
+	:
+}
+
+do_install () {
+	cd ${S}/
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/create-resources
+	cp -R * ${D}/${datadir}/puppet/modules/create-resources
+	# chown -R root:root ${D}/
+}
+
+FILES_${PN}_append += " \
+	${datadir}/puppet/modules/create-resources \
+	"

recipes-core/stx-integ/puppet-dnsmasq.bb

@@ -0,0 +1,36 @@
+DESCRIPTION = "puppet-dnsmasq"
+
+STABLE = "master"
+PROTOCOL = "https"
+BRANCH = "master"
+# SRCREV = "cff07e90890662972c97684a2baee964f68ff3ed"
+SRCREV = "89759de7d7bb45fb4527ff0aa5f75f258fd0cae9"
+S = "${WORKDIR}/git"
+
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+SRC_URI = "git://github.com/netmanagers/puppet-dnsmasq;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
+
+RDEPENDS_${PN}_append = " \
+	puppet \
+	"
+
+do_configure () {
+	:
+} 
+
+do_compile() {
+	:
+}
+
+do_install () {
+	cd ${S}/
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/dnsmasq
+	cp -R * ${D}/${datadir}/puppet/modules/dnsmasq/
+}
+
+FILES_${PN}_append += " \
+	${datadir}/puppet/modules/dnsmasq/ \
+	"

recipes-core/stx-integ/puppet-drbd_git.bb

@@ -0,0 +1,27 @@
+DESCRIPTION = "puppet-drbd"
+
+STABLE = "master"
+PROTOCOL = "https"
+BRANCH = "master"
+SRCREV = "496b3ba9cd74a2d12636f9e90a718739a5451169"
+S = "${WORKDIR}/git"
+
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6089b6bd1f0d807edb8bdfd76da0b038 "
+
+SRC_URI = "git://github.com/puppetlabs/puppetlabs-drbd.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://puppet-modules/0001-TIS-Patches.patch \
+	file://puppet-modules/0002-Disable-timeout-for-mkfs-command.patch \
+	file://puppet-modules/0003-drbd-parallel-to-serial-synchronization.patch \
+	file://puppet-modules/0004-US-96914-reuse-existing-drbd-cinder-resource.patch \
+	file://puppet-modules/0005-Add-PausedSync-states-to-acceptable-cstate.patch \
+	file://puppet-modules/0006-CGTS-7164-Add-resource-options-cpu-mask-to-affine-drbd-kernel-threads.patch \
+	file://puppet-modules/0007-Add-disk-by-path-test.patch \
+	file://puppet-modules/0008-CGTS-7953-support-for-new-drbd-resources.patch \
+	file://puppet-modules/0009-drbd-slow-before-swact.patch \
+	"
+
+DEPENDS += " \
+	puppet \
+	"

recipes-core/stx-integ/setup-config.bb

@@ -1,42 +0,0 @@
-DESCRIPTION = "setup-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/setup-config
-	install -d ${D}/${datadir}/starlingx
-	install -d ${D}/${sysconfdir}/profile.d
-
-	install -m640 files/motd ${D}/${datadir}/starlingx/stx.motd
-	install -m640 files/prompt.sh ${D}/${sysconfdir}/profile.d/prompt.sh
-	install -m640 files/custom.sh ${D}/${sysconfdir}/profile.d/custom.sh
-
-}
-
-FILES_${PN}_append += " \
-	${datadir} \
-	"
-		

recipes-core/stx-integ/stx-base.inc

@@ -0,0 +1,81 @@
+DESCRIPTION = "stx-base"
+
+# TODO:
+# Much of what is being done here must go into bbappends 
+
+
+#STABLE = "starlingx/master"
+#PROTOCOL = "https"
+#BRANCH = "master"
+#SRCREV = "8638c37d647a5989ee821276dc42524db7e644f8"
+#S = "${WORKDIR}/git"
+#PV = "19.05"
+#
+#LICENSE = "Apache-2.0"
+#
+#LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+#
+#SRC_URI = "git://opendev.org/starlingx/integ.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+#	file://base/0001-cgcs-users-with-patch-ibsh-patches.patch \
+#	file://base/0002-Add-DESTDIR-CFLAGS-and-LDFLAGS.patch \
+#	"
+
+# base
+require base/cgcs-users.inc
+require base/dhcp-config.inc
+require base/dnsmasq-config.inc
+require base/haproxy-config.inc
+require base/initscripts-config.inc
+require base/lighttpd-config.inc
+require base/net-snmp-config.inc
+require base/openssh-config.inc
+require base/setup-config.inc
+require base/systemd-config.inc
+
+# ceph
+
+# config
+
+# config-files
+
+# database
+
+# filesystem
+
+# kernel
+
+# kubernetes
+
+# ldap
+
+# logging
+
+# monitoring
+
+# networking
+
+# python
+
+# security
+
+# storage-drivers
+
+# tools
+
+# utilities 
+
+# virt
+
+do_configure () {
+	:
+} 
+
+do_compile() {
+	:
+}
+
+do_install () {
+	:
+}
+
+FILES_${PN} = " "

recipes-core/stx-integ/stx-config-files.inc

@@ -0,0 +1,14 @@
+DESCRIPTION = " stx-integ-config-files"
+
+require config-files/audit-config.inc
+require config-files/io-scheduler.inc
+require config-files/docker-config.inc
+require config-files/iptables-config.inc
+require config-files/memcached-custom.inc
+require config-files/ntp-config.inc
+require config-files/pam-config.inc
+require config-files/shadow-utils-config.inc
+require config-files/rsync-config.inc
+require config-files/sudo-config.inc
+require config-files/syslog-ng-config.inc
+require config-files/util-linux-config.inc

recipes-core/stx-integ/stx-integ.bb

@@ -0,0 +1,78 @@
+DESCRIPTION = "stx-integ"
+
+# TODO:
+# Much of what is being done here must go into bbappends 
+
+
+STABLE = "starlingx/master"
+PROTOCOL = "https"
+BRANCH = "master"
+SRCREV = "8638c37d647a5989ee821276dc42524db7e644f8"
+S = "${WORKDIR}/git"
+PV = "19.05"
+
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI = "git://opendev.org/starlingx/integ.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://base/0001-cgcs-users-with-patch-ibsh-patches.patch \
+	file://base/0002-Add-DESTDIR-CFLAGS-and-LDFLAGS.patch \
+	"
+
+RDEPENDS_${PN}_append = " \
+	puppet-boolean \
+	puppet-create-resources \
+	puppet-dnsmasq \
+	"
+
+require	stx-base.inc
+require	stx-config-files.inc
+
+
+# ceph
+
+
+# config-files
+
+# database
+
+# filesystem
+
+# kernel
+
+# kubernetes
+
+# ldap
+
+# logging
+
+# monitoring
+
+# networking
+
+# python
+
+# security
+
+# storage-drivers
+
+# tools
+
+# utilities 
+
+# virt
+
+do_configure () {
+	:
+} 
+
+do_compile() {
+	:
+}
+
+do_install () {
+	:
+}
+
+FILES_${PN} = " "

recipes-core/stx-integ/stx-integ.inc

@@ -1,2 +0,0 @@
-inherit externalsrc
-EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ"

recipes-core/stx-integ/systemd-config.bb

@@ -1,42 +0,0 @@
-DESCRIPTION = "systemd-config"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-integ.inc
-
-RDEPENDS_${PN} += " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/base/systemd-config
-	install -d ${D}/${datadir}/starlingx
-
-	install -m644 files/60-persistent-storage.rules ${D}/${datadir}/starlingx/60-persistent-storage.rules
-	install -m644 files/journald.conf ${D}/${datadir}/starlingx/journald.conf
-	install -m644 files/systemd.conf.tmpfiles.d ${D}/${datadir}/starlingx/
-	install -m644 files/tmp.conf.tmpfiles.d ${D}/${datadir}/starlingx/
-	install -m644 files/tmp.mount ${D}/${datadir}/starlingx/
-
-}
-
-FILES_${PN}_append += " \
-	${datadir} \
-	"

recipes-core/stx-metal/mtce-compute.inc

@@ -1,6 +1,6 @@
 PACKAGES += " mtce-compute"
 
-RDEPENDS_mtce-compute_append = " bash"
+RDEPENDS_mtce-compute += " bash"
 
 do_configure_prepend () {
 	:

recipes-core/stx-metal/mtce-control.inc

@@ -1,6 +1,6 @@
 PACKAGES += " mtce-control"
 
-RDEPENDS_mtce-control_append = " bash"
+RDEPENDS_mtce-control += " bash"
 
 do_configure_prepend () {
 	:

recipes-core/stx-metal/mtce.inc

@@ -1,9 +1,14 @@
 PACKAGES += " mtce"
+PACKAGES += " mtce-pmon"
+PACKAGES += " mtce-hwmon"
+PACKAGES += " mtce-hostw"
+PACKAGES += " mtce-lmon"
 
 #DEPENDS = " \
 #	mtce-common \
 #	"
 #
+RDEPENDS_mtce-pmon_append = " bash"
 RDEPENDS_mtce_append = " bash"
 #
 
@@ -164,10 +169,43 @@ pkg_postinst_ontarget_mtce_prepend () {
 	/bin/systemctl enable hbsAgent.service
 }
 
-FILES_mtce = " \
-	${bindir}/lmond \
-	${bindir}/hostwd \
+FILES_mtce-pmon = " \
+	${sbindir}/pmon-restart \
+	${sbindir}/pmon-start \
+	${sbindir}/pmon-stop \
+	${bindir}/pmond \
+	${systemd_system_unitdir}/pmon.service \
+	${sysconfdir}/mtc/pmond.conf \
+	${sysconfdir}/init.d/pmon \
+	${sysconfdir}/logrotate.d/pmon.logrotate \
+	"
+
+FILES_mtce-hwmon = " \
 	${bindir}/hwmond \
+	${sysconfdir}/init.d/hwmon \
+	${libdir}/ocf/resource.d/platform/hwmon \
+	${sysconfdir}/logrotate.d/hwmon.logrotate \
+	${systemd_system_unitdir}/hwmon.service \
+	${sysconfdir}/mtc/hwmond.conf \
+	"
+
+FILES_mtce-hostw = " \
+	${sysconfdir}/mtc/hostwd.conf \
+	${sysconfdir}/logrotate.d/hostw.logrotate \
+	${systemd_system_unitdir}/hostw.service \
+	${sysconfdir}/init.d/hostw \
+	${bindir}/hostwd \
+	"
+
+FILES_mtce-lmon= " \
+	${bindir}/lmond \
+	${sysconfdir}/mtc/lmond.conf \
+	${sysconfdir}/logrotate.d/lmon.logrotate \
+	${sysconfdir}/pmon.d/lmon.conf \
+	${sysconfdir}/init.d/lmon \
+	"
+
+FILES_mtce = " \
 	${bindir}/mtcAgent \
 	${bindir}/mtcClient \
 	${bindir}/fsmond \
@@ -175,30 +213,21 @@ FILES_mtce = " \
 	${bindir}/wipedisk \
 	${bindir}/hbsClient \
 	${bindir}/mtcalarmd \
-	${bindir}/pmond \
 	${bindir}/mtclogd \
-	${sbindir}/pmon-stop \
 	${sbindir}/fsync \
 	${sbindir}/dmemchk.sh \
-	${sbindir}/pmon-restart \
-	${sbindir}/pmon-start \
 	${libdir}/ocf/resource.d/platform/mtcAgent \
-	${libdir}/ocf/resource.d/platform/hwmon \
 	${libdir}/libamon.so.1 \
 	${systemd_system_unitdir}/mtcalarm.service \
 	${systemd_system_unitdir}/goenabled.service \
 	${systemd_system_unitdir}/mtclog.service \
-	${systemd_system_unitdir}/hostw.service \
 	${systemd_system_unitdir}/mtcClient.service \
 	${systemd_system_unitdir}/fsmon.service \
 	${systemd_system_unitdir}/hbsClient.service \
-	${systemd_system_unitdir}/hwmon.service \
-	${systemd_system_unitdir}/pmon.service \
 	${systemd_system_unitdir}/hwclock.service \
 	${systemd_system_unitdir}/runservices.service \
 	${systemd_system_unitdir}/lmon.service \
 	${sysconfdir}/pmon.d/nslcd.conf \
-	${sysconfdir}/pmon.d/lmon.conf \
 	${sysconfdir}/pmon.d/mtclogd.conf \
 	${sysconfdir}/pmon.d/mtcalarm.conf \
 	${sysconfdir}/pmon.d/syslog-ng.conf \
@@ -208,17 +237,13 @@ FILES_mtce = " \
 	${sysconfdir}/pmon.d/hbsClient.conf \
 	${sysconfdir}/pmon.d/mtcClient.conf \
 	${sysconfdir}/init.d/runservices \
-	${sysconfdir}/init.d/hostw \
 	${sysconfdir}/init.d/goenabled \
 	${sysconfdir}/init.d/mtcClient \
 	${sysconfdir}/init.d/hwclock.sh \
 	${sysconfdir}/init.d/mtclog \
 	${sysconfdir}/init.d/mtcalarm \
-	${sysconfdir}/init.d/lmon \
 	${sysconfdir}/init.d/hbsClient \
 	${sysconfdir}/init.d/fsmon \
-	${sysconfdir}/init.d/pmon \
-	${sysconfdir}/init.d/hwmon \
 	${sysconfdir}/mtc.conf \
 	${sysconfdir}/bmc/server_profiles.d/sensor_hp380_v1_ilo_v4.profile \
 	${sysconfdir}/bmc/server_profiles.d/sensor_hp360_v1_ilo_v4.profile \
@@ -226,18 +251,10 @@ FILES_mtce = " \
 	${sysconfdir}/serverices.d/worker/mtcTest \
 	${sysconfdir}/serverices.d/controller/mtcTest \
 	${sysconfdir}/serverices.d/storage/mtcTest \
-	${sysconfdir}/mtc/hostwd.conf \
 	${sysconfdir}/mtc/fsmond.conf \
-	${sysconfdir}/mtc/pmond.conf \
-	${sysconfdir}/mtc/lmond.conf \
-	${sysconfdir}/mtc/hwmond.conf \
 	${sysconfdir}/mtc/tmp/ \
 	${sysconfdir}/mtc.ini \
-	${sysconfdir}/logrotate.d/lmon.logrotate \
 	${sysconfdir}/logrotate.d/fsmon.logrotate \
-	${sysconfdir}/logrotate.d/pmon.logrotate \
-	${sysconfdir}/logrotate.d/hwmon.logrotate \
-	${sysconfdir}/logrotate.d/hostw.logrotate \
 	${sysconfdir}/logrotate.d/mtcalarm.logrotate \
 	${sysconfdir}/logrotate.d/mtce.logrotate \
 	"

recipes-core/stx-nfv/files/use-ldflags-mtce-guest.patch

@@ -0,0 +1,15 @@
+diff --git a/mtce-guest/src/Makefile b/mtce-guest/src/Makefile
+index 40dd933..ba6e029 100644
+--- a/mtce-guest/src/Makefile
++++ b/mtce-guest/src/Makefile
+@@ -31,8 +31,8 @@ LDLIBS = $(EXTRALDFLAGS) -lstdc++ -ldaemon -lcommon -lfmcommon -ljson-c -levent
+ INCLUDES = -I. -I/usr/include/mtce-common -I/usr/include/mtce-daemon
+ 
+ build: $(OBJS)
+-	$(CXX) $(CCPFLAGS) $(AGENT_OBJS)  $(LDLIBS) -L. -o guestAgent
+-	$(CXX) $(CCPFLAGS) $(SERVER_OBJS) $(LDLIBS) -L. -o guestServer
++	$(CXX) $(CCPFLAGS) $(LDFLAGS) $(AGENT_OBJS)  $(LDLIBS) -L. -o guestAgent
++	$(CXX) $(CCPFLAGS) $(LDFLAGS) $(SERVER_OBJS) $(LDLIBS) -L. -o guestServer
+ 
+ .cpp.o:
+ 	$(CXX) $(INCLUDES) $(CCPFLAGS) $(EXTRACCFLAGS) -c $< -o $@

recipes-core/stx-nfv/mtce-guest.bb

@@ -1,57 +0,0 @@
-DESCRIPTION = "mtce-guest"
-
-# TODO: 
-# Really need to fix the package;s Makefile
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-nfv.inc
-
-DEPENDS = " \
-	mtce-common \
-	mtce \
-	json-c \
-	"
-
-RDEPENDS_${PN}_append = " bash"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	cd ${S}/mtce-guest/src/
-	oe_runmake -e VER=1 VER_MJR=1 INCLUDES=" -I. " \
-		CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" build
-}
-
-do_install () {
-
-	cd ${S}/mtce-guest/src/
-	make install DESTDIR=${D} PREFIX=${D}/usr/ \
-		       SYSCONFDIR=${D}/${sysconfdir} \
-		            LOCALBINDIR=${D}/${bindir} \
-			         UNITDIR=${D}/${systemd_system_unitdir}
-}
-
-pkg_postinst_ontarget_${PN} () { 
-	/bin/systemctl enable guestServer.service
-}
-
-FILES_${PN}_append = " \
-	systemd_system_unitdir} \
-	${libdir} \
-	${baselib} \
-	run \
-"

recipes-core/stx-nfv/mtce-guest.inc

@@ -0,0 +1,51 @@
+PACKAGES += " mtce-guestagent"
+PACKAGES += " mtce-guestserver"
+
+# RDEPENDS_mtce-guestagent_append = " "
+# RDEPENDS_mtce-guestAgent_append = " "
+
+#RDEPENDS_mtce-guestServer_append = " \
+#	bash \
+#	libstdc++ \
+#	"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	cd ${S}/mtce-guest/src/
+	oe_runmake -e VER=1 VER_MJR=1 INCLUDES=" -I. " \
+		CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" build
+}
+
+do_install_prepend () {
+
+	cd ${S}/mtce-guest/src/
+	oe_runmake -e install DESTDIR=${D} PREFIX=${D}/usr/ \
+		       SYSCONFDIR=${D}/${sysconfdir} \
+		            LOCALBINDIR=${D}/${bindir} \
+			         UNITDIR=${D}/${systemd_system_unitdir}
+	rm -rf ${D}/var
+	rm -rf ${D}/var/run
+}
+
+FILES_mtce-guestserver = " \
+	${sysconfdir}/mtc/tmp \
+	${sysconfdir}/mtc/guestServer.ini \
+	${sysconfdir}/pmon.d/guestServer.conf \
+	${sysconfdir}/logrotate.d/guestServer.logrotate \
+	${systemd_system_unitdir}/guestServer.service \
+	${sysconfdir}/init.d/guestServer \
+	${bindir}/guestServer \
+	"
+
+FILES_mtce-guestagent = " \ 
+	${sysconfdir}/mtc/tmp \
+	${sysconfdir}/mtc/guestAgent.ini \
+	${systemd_system_unitdir}/guestAgent.service \
+	${sysconfdir}/logrotate.d/guestAgent.logrotate \
+	${sysconfdir}/init.d/guestAgent \
+	${libdir}/ocf/resource.d/platform/guestAgent \
+	${bindir}/guestAgent \
+" 

recipes-core/stx-nfv/mtce-guestAgent.inc

@@ -0,0 +1,63 @@
+# PACKAGES += " mtce-guest"
+PACKAGES += " mtce-guestAgent"
+# PACKAGES += " mtce-guestServer"
+
+# RDEPENDS_mtce-guestAgent_append = " bash libstdc++ libevent libgcc openssl json-c stx-fault stx-metal"
+# RDEPENDS_mtce-guestAgent_append = " bash libstdc++ libevent libgcc openssl json-c stx-fault stx-metal"
+
+#RDEPENDS_mtce-guestServer_append = " \
+#	bash \
+#	libstdc++ \
+#	"
+
+do_configure_prepend () {
+	:
+} 
+
+do_compile_prepend () {
+	cd ${S}/mtce-guest/src/
+	oe_runmake -e VER=1 VER_MJR=1 INCLUDES=" -I. " \
+		CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" build
+}
+
+do_install_prepend () {
+
+	cd ${S}/mtce-guest/src/
+	oe_runmake -e install DESTDIR=${D} PREFIX=${D}/usr/ \
+		       SYSCONFDIR=${D}/${sysconfdir} \
+		            LOCALBINDIR=${D}/${bindir} \
+			         UNITDIR=${D}/${systemd_system_unitdir}
+	rm ${D}/${bindir}/guestServer 
+	# rm ${D}/${bindir}/guestAgent 
+}
+
+#pkg_postinst_ontarget_${PN} () { 
+#	/bin/systemctl enable guestServer.service
+#}
+
+
+#	${bindir}/guestServer \
+# FILES_mtce-guestServer += " 
+FILES_mtce-guestAgent += " \ 
+	${sysconfdir}/mtc/tmp \
+	${sysconfdir}/mtc/guestServer.ini \
+	${sysconfdir}/pmon.d/guestServer.conf \
+	${sysconfdir}/logrotate.d/guestServer.logrotate \
+	${systemd_system_unitdir}/guestServer.service \
+	${sysconfdir}/init.d/guestServer \
+	/var/run \
+	/run  \
+	"
+
+# FILES_mtce-guestAgent += " 
+FILES_mtce-guestAgent += " \ 
+	${sysconfdir}/mtc/tmp \
+	${sysconfdir}/mtc/guestAgent.ini \
+	${systemd_system_unitdir}/guestAgent.service \
+	${sysconfdir}/logrotate.d/guestAgent.logrotate \
+	${sysconfdir}/init.d/guestAgent \
+	${libdir}/ocf/resource.d/platform/guestAgent \
+	${bindir}/guestAgent \
+	/var/run \
+	/run \
+" 

recipes-core/stx-nfv/nfv-client.bb

@@ -1,45 +0,0 @@
-DESCRIPTION = "nfv-client"
-
-
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "cdd6c334d9d1d6c0f4de344fff8ef2af28c76e56"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-
-
-SRC_URI = "git://opendev.org/starlingx/nfv.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-require stx-nfv.inc
-inherit setuptools
-
-
-do_configure () {
-	cd ${S}/nfv/nfv-client
-	distutils_do_configure
-} 
-
-do_compile() {
-	cd ${S}/nfv/nfv-client
-	distutils_do_compile
-}
-
-do_install () {
-	cd ${S}/nfv/nfv-client
-	distutils_do_install
-	
-	install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
-	install -m 444 scripts/sw-manager.completion ${D}/${sysconfdir}/bash_completion.d/sw-manager
-
-}
-
-#pkg_postinst_ontarget_${PN} () {
-
-# FILES_${PN}_append += " ${systemd_unitdir}/* "

recipes-core/stx-nfv/nfv-client.inc

@@ -0,0 +1,30 @@
+PACKAGES += " nfv-client"
+
+inherit setuptools
+
+
+do_configure_prepend () {
+	cd ${S}/nfv/nfv-client
+	distutils_do_configure
+} 
+
+do_compileprepend () {
+	cd ${S}/nfv/nfv-client
+	distutils_do_compile
+}
+
+do_install_prepend () {
+	cd ${S}/nfv/nfv-client
+	distutils_do_install
+	
+	install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
+	install -m 444 scripts/sw-manager.completion ${D}/${sysconfdir}/bash_completion.d/sw-manager
+
+}
+
+FILES_nfv-client = " \
+	${bindir}/sw-manager \
+	${sysconfdir}/bash_completion.d/sw-manager \
+	${libdir}/python2.7/site-packages/nfv_client*egg-info \
+	${libdir}/python2.7/site-packages/nfv_client \
+	"