Merge "linux-yocto-stx: add hp server support for anaconda"

diff --git a/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb b/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb
index 33d3b77..4fdfddf 100644 (file)
--- a/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb
+++ b/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb
@@ -411,6 +411,7 @@ pkg_postinst_ontarget_net-snmp-config() {
 
        install -m 644 ${SRCPATH}/stx.snmpd.conf    ${datadir}/starlingx/stx.snmpd.conf
        install -m 755 ${SRCPATH}/stx.snmpd         ${sysconfdir}/rc.d/init.d/snmpd
+       install -m 755 ${SRCPATH}/stx.snmpd         ${sysconfdir}/init.d/snmpd
        install -m 660 ${SRCPATH}/stx.snmp.conf     ${datadir}/snmp/snmp.conf
        install -m 644 ${SRCPATH}/snmpd.service     ${sysconfdir}/systemd/system/snmpd.service
        

diff --git a/meta-stx/recipes-core/stx-metal/mtce-control.inc b/meta-stx/recipes-core/stx-metal/mtce-control.inc
index 3d0f241..dfb67c0 100644 (file)
--- a/meta-stx/recipes-core/stx-metal/mtce-control.inc
+++ b/meta-stx/recipes-core/stx-metal/mtce-control.inc
@@ -35,15 +35,9 @@ do_install_prepend () {
        oe_runmake buildroot=${D} \
                _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \
                install
-
+       sed -i -e 's|/usr/local/bin/|${bindir}/|' ${D}/${sysconfdir}/init.d/hbsAgent
 }
 
-#pkg_postinst_ontarget_mtce-control () {
-#      # /usr/bin/systemctl enable lighttpd.service
-#      # /usr/bin/systemctl enable qemu_clean.service
-#      /usr/bin/systemctl enable hbsAgent.service
-#}
-
 FILES_mtce-control = " \
        ${datadir}/licenses/mtce-control-1.0/LICENSE \
        ${systemd_system_unitdir}/hbsAgent.service \

diff --git a/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb b/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb
index 7cc8dab..1f54f1d 100644 (file)
--- a/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb
+++ b/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb
@@ -81,6 +81,7 @@ do_compile () {
 
        # Host a server for the charts
        helm serve --repo-path . &
+       sleep 1
        helm repo rm local
        helm repo add local http://localhost:8879/charts
 
@@ -88,9 +89,8 @@ do_compile () {
        rm -rf elasticsearch/Makefile
        make elasticsearch
 
-       # terminate helm server
-       pid=`/bin/pidof helm`
-       kill ${pid}
+       # terminate helm server (the last backgrounded task)
+       kill $!
        rm -rf ${helm_home}
 }
 

diff --git a/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm_1.0.bb b/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm_1.0.bb
index 78503ac..375c006 100644 (file)
--- a/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm_1.0.bb
+++ b/meta-stx/recipes-core/stx-monitor-armada-app/monitor-helm_1.0.bb
@@ -88,6 +88,7 @@ do_compile () {
 
        # Host a server for the charts
        helm serve --repo-path . &
+       sleep 1
        helm repo rm local
        helm repo add local http://localhost:8879/charts
 
@@ -101,9 +102,8 @@ do_compile () {
        make logstash
        make elasticsearch-curator
 
-       # terminate helm server
-       pid=`/bin/pidof helm`
-       kill ${pid}
+       # terminate helm server (the last backgrounded task)
+       kill $!
        rm -rf ${helm_home}
 }
 

diff --git a/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm-infra_1.0.bb b/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm-infra_1.0.bb
index 92ad899..2b7e196 100644 (file)
--- a/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm-infra_1.0.bb
+++ b/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm-infra_1.0.bb
@@ -78,6 +78,7 @@ do_compile () {
        # Host a server for the charts
        tmpdir=`mktemp -d ${B}/charts-XXXXXX`
        helm serve ${tmpdir} --address localhost:8879 --url http://localhost:8879/charts &
+       sleep 1
        helm repo rm local
        helm repo add local http://localhost:8879/charts
 
@@ -92,9 +93,8 @@ do_compile () {
        make rabbitmq
        make ceph-rgw
 
-       # terminate helm server
-       pid=`/bin/pidof helm`
-       kill ${pid}
+       # terminate helm server (the last backgrounded task)
+       kill $!
        rm -rf ${helm_home}
 }
 

diff --git a/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm_1.0.bb b/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm_1.0.bb
index 17b1fe0..a43d9f4 100644 (file)
--- a/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm_1.0.bb
+++ b/meta-stx/recipes-core/stx-openstack-armada-app/openstack-helm_1.0.bb
@@ -85,6 +85,7 @@ do_compile () {
 
        # Host a server for the charts
        helm serve --repo-path . &
+       sleep 1
        helm repo rm local
        helm repo add local http://localhost:8879/charts
 
@@ -104,9 +105,8 @@ do_compile () {
        make panko
        make placement
 
-       # terminate helm server
-       pid=`/bin/pidof helm`
-       kill ${pid}
+       # terminate helm server (the last backgrounded task)
+       kill $!
        rm -rf ${helm_home}
 
        # Remove the helm-toolkit tarball

diff --git a/meta-stx/recipes-core/stx-openstack-armada-app/stx-openstack-helm_1.0.bb b/meta-stx/recipes-core/stx-openstack-armada-app/stx-openstack-helm_1.0.bb
index 0941ab7..d4635a8 100644 (file)
--- a/meta-stx/recipes-core/stx-openstack-armada-app/stx-openstack-helm_1.0.bb
+++ b/meta-stx/recipes-core/stx-openstack-armada-app/stx-openstack-helm_1.0.bb
@@ -74,6 +74,7 @@ do_compile () {
 
        # Host a server for the charts
        helm serve --repo-path . &
+       sleep 1
        helm repo rm local
        helm repo add local http://localhost:8879/charts
 
@@ -87,9 +88,8 @@ do_compile () {
        make dcdbsync
        cd -
 
-       # terminate helm server
-       pid=`/bin/pidof helm`
-       kill ${pid}
+       # terminate helm server (the last backgrounded task)
+       kill $!
        rm -rf ${helm_home}
 
        # Remove the helm-toolkit tarball

diff --git a/meta-stx/recipes-core/stx-platform-armada-app/stx-platform-helm_1.0.bb b/meta-stx/recipes-core/stx-platform-armada-app/stx-platform-helm_1.0.bb
index 6f041e4..88cf8b2 100644 (file)
--- a/meta-stx/recipes-core/stx-platform-armada-app/stx-platform-helm_1.0.bb
+++ b/meta-stx/recipes-core/stx-platform-armada-app/stx-platform-helm_1.0.bb
@@ -80,6 +80,7 @@ do_compile () {
 
        # Host a server for the charts
        helm serve --repo-path . &
+       sleep 1
        helm repo rm local
        helm repo add local http://localhost:8879/charts
 
@@ -92,9 +93,8 @@ do_compile () {
        make node-feature-discovery
        cd -
 
-       # Terminate helm server
-       pid=`/bin/pidof helm`
-       kill ${pid}
+       # Terminate helm server (the last backgrounded task)
+       kill $!
        rm -rf ${helm_home}
 
        # Create a chart tarball compliant with sysinv kube-app.py

diff --git a/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc b/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
index 8a8f155..002ad36 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
+++ b/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
@@ -74,6 +74,12 @@ do_install_append() {
        install -d -m0755 ${D}/${systemd_system_unitdir}
        install -m0644 -p -D collect-engtools.service ${D}/${systemd_system_unitdir}
 
+       sed -i -e 's/network.service/networking.service/' \
+               ${D}/${systemd_system_unitdir}/collect-engtools.service
+
+       sed -i -e 's|/usr/local/bin/|${bindir}/|' \
+               ${D}/${sysconfdir}/init.d/collect-engtools.sh \
+               ${D}/${bindir}/cleanup-engtools.sh
 }
 
 FILES_collect-engtools = "  \

diff --git a/meta-stx/recipes-core/stx-utilities/tools/collector.inc b/meta-stx/recipes-core/stx-utilities/tools/collector.inc
index 4aa163d..cd837ca 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/tools/collector.inc
+++ b/meta-stx/recipes-core/stx-utilities/tools/collector.inc
@@ -65,6 +65,11 @@ do_install_append() {
        install -m 755 etc.exclude ${D}/${sysconfdir}/collect/etc.exclude
        install -m 755 run.exclude ${D}/${sysconfdir}/collect/run.exclude
 
+       sed -i -e 's|/usr/local/bin/|${bindir}/|' \
+              -e 's|/usr/local/sbin/|${sbindir}/|' \
+               ${D}/${sysconfdir}/collect.d/collect* \
+               ${D}/${sbindir}/collect*
+
        ln -sf ${sbindir}/collect ${D}/${bindir}/collect
 }
 

diff --git a/meta-stx/recipes-devtools/python/python-django-horizon_15.1.0.bbappend b/meta-stx/recipes-devtools/python/python-django-horizon_15.1.0.bbappend
index ea77f18..e046661 100644 (file)
--- a/meta-stx/recipes-devtools/python/python-django-horizon_15.1.0.bbappend
+++ b/meta-stx/recipes-devtools/python/python-django-horizon_15.1.0.bbappend
@@ -71,6 +71,7 @@ do_install_append () {
        install -d -m 755 ${D}/opt/branding
        mkdir -p ${D}${sysconfdir}/rc.d/init.d
        install -m 755 -D -p ${WORKDIR}/${BPN}/horizon.init ${D}${sysconfdir}/rc.d/init.d/horizon
+       install -m 755 -D -p ${WORKDIR}/${BPN}/horizon.init ${D}${sysconfdir}/init.d/horizon
        install -m 755 -D -p ${WORKDIR}/${BPN}/horizon-clearsessions ${D}/${bindir}/horizon-clearsessions
        install -m 755 -D -p ${WORKDIR}/${BPN}/horizon-patching-restart ${D}/${bindir}/horizon-patching-restart
        install -m 755 -D -p ${WORKDIR}/${BPN}/horizon-assets-compress ${D}/${bindir}/horizon-assets-compress