Revert "Revert "oran-shell-release: release image for F""

[pti/rtp.git] / meta-starlingx / meta-stx-cloud / recipes-support / puppet / puppet-network_git.bbappend

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bbappend b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bbappend
index 5754d05..bddadf3 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bbappend
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bbappend
@@ -1,16 +1,23 @@
+inherit stx-metadata
+
+STX_REPO = "integ"
+STX_SUBPATH = "config/puppet-modules/${BPN}/centos/files"
+
+SRC_URI_STX += " \
+       file://puppet-network-Kilo-quilt-changes.patch;striplevel=5 \
+       file://puppet-network-support-ipv6.patch;striplevel=5 \
+       file://Don-t-write-absent-to-redhat-route-files-and-test-fo.patch;striplevel=5 \
+       file://fix-absent-options.patch;striplevel=5 \
+       file://permit-inservice-update-of-static-routes.patch;striplevel=5 \
+       file://ipv6-static-route-support.patch;striplevel=5 \
+       file://route-options-support.patch;striplevel=5 \
+       "
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI += " \
-       file://${BPN}/puppet-network-Kilo-quilt-changes.patch;striplevel=5 \
-       file://${BPN}/puppet-network-support-ipv6.patch;striplevel=5 \
-       file://${BPN}/Don-t-write-absent-to-redhat-route-files-and-test-fo.patch;striplevel=5 \
-       file://${BPN}/fix-absent-options.patch;striplevel=5 \
-       file://${BPN}/permit-inservice-update-of-static-routes.patch;striplevel=5 \
-       file://${BPN}/ipv6-static-route-support.patch;striplevel=5 \
-       file://${BPN}/route-options-support.patch;striplevel=5 \
        file://${BPN}/0001-Stx-uses-puppet-boolean-instead-of-adrien-boolean.patch \
        file://${BPN}/puppet-network-updates-for-poky-stx.patch \
        file://${BPN}/puppet-network-config-poky-provider.patch \
+       file://${BPN}/puppet-network-poky-stx.rb-add-vlan-support.patch \
        " 
 
 inherit openssl10