diff options
| -rwxr-xr-x | fuel-plugin/vagrant/build_fuel_plugin.sh | 12 | ||||
| -rw-r--r-- | kernel/arch/x86/configs/opnfv.config | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/fuel-plugin/vagrant/build_fuel_plugin.sh b/fuel-plugin/vagrant/build_fuel_plugin.sh index b18ae173b..e315b111f 100755 --- a/fuel-plugin/vagrant/build_fuel_plugin.sh +++ b/fuel-plugin/vagrant/build_fuel_plugin.sh @@ -1,13 +1,8 @@ #!/bin/bash sudo apt-get update -y -sudo apt-get install createrepo rpm dpkg-dev -y -sudo apt-get install python-setuptools -y -sudo apt-get install python-pip -y -sudo easy_install pip -sudo pip install fuel-plugin-builder -sudo apt-get install ruby -y -sudo gem install rubygems-update +sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev sudo gem install fpm +sudo pip install fuel-plugin-builder sudo apt-get install docker.io -y cd /home/vagrant # Will build fuel-plugin-kvm in guest VM local directory, not change host @@ -15,5 +10,4 @@ cp -r /kvmfornfv . cd kvmfornfv/fuel-plugin fpb --debug --build . # Copy the built fuel-plugin-kvm back to the host -rm /kvmfornfv/fuel-plugin/fuel-plugin-kvm*.rpm -cp fuel-plugin-kvm*.rpm /kvmfornfv/fuel-plugin/. +cp *.rpm /vagrant diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config index 2d6d1cc4e..b623b0cd4 100644 --- a/kernel/arch/x86/configs/opnfv.config +++ b/kernel/arch/x86/configs/opnfv.config @@ -885,7 +885,7 @@ CONFIG_NETFILTER_XTABLES=m # Xtables combined modules # CONFIG_NETFILTER_XT_MARK=m -# CONFIG_NETFILTER_XT_CONNMARK is not set +CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_SET=m # @@ -894,7 +894,7 @@ CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m CONFIG_NETFILTER_XT_TARGET_CT=m # CONFIG_NETFILTER_XT_TARGET_DSCP is not set @@ -929,7 +929,7 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set # CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m # CONFIG_NETFILTER_XT_MATCH_CPU is not set # CONFIG_NETFILTER_XT_MATCH_DCCP is not set @@ -1227,6 +1227,7 @@ CONFIG_NET_CLS_ACT=y # CONFIG_NET_ACT_CSUM is not set # CONFIG_NET_ACT_VLAN is not set # CONFIG_NET_ACT_BPF is not set +# CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y |