diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/opnfv-environment.yaml | 4 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 9 | ||||
| -rwxr-xr-x | build/undercloud.sh | 1 |
3 files changed, 4 insertions, 10 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index aab72bc9..e29b0c7a 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -16,6 +16,8 @@ parameter_defaults: #PmdCoreList: 1 #OvsDpdkCoreList: 2 #OvsDpdkSocketMemory: 1024 + #ControllerExtraConfig: + #NovaComputeExtraConfig: ExtraConfig: tripleo::ringbuilder::build_ring: False nova::nova_public_key: @@ -115,6 +117,7 @@ parameter_defaults: - OS::TripleO::Services::Congress - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::OVNDBs + - OS::TripleO::Services::Vpp ComputeServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient @@ -140,3 +143,4 @@ parameter_defaults: - OS::TripleO::Services::VipHosts - OS::TripleO::Services::NeutronHoneycombAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::Vpp diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 9de6d9ab..963579f3 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -68,13 +68,6 @@ pushd puppet-tacker > /dev/null git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz popd > /dev/null -# tar up the ovn puppet module -rm -rf puppet-ovn -git clone https://github.com/openstack/puppet-ovn -pushd puppet-ovn > /dev/null -git archive --format=tar.gz --prefix=ovn/ origin/stable/ocata > ${BUILD_DIR}/puppet-ovn.tar.gz -popd > /dev/null - # Master FD.IO Repo cat > ${BUILD_DIR}/fdio.repo << EOF [fdio-master] @@ -158,8 +151,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install /root/$tacker_pkg \ --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \ --install /root/$tackerclient_pkg \ - --upload ${BUILD_DIR}/puppet-ovn.tar.gz:/etc/puppet/modules/ \ - --run-command "cd /etc/puppet/modules/ && rm -fr ovn && tar xzf puppet-ovn.tar.gz" \ --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \ --run-command "mkdir /root/ovs27" \ --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \ diff --git a/build/undercloud.sh b/build/undercloud.sh index e3194e2b..de96f029 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -67,7 +67,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install "openstack-heat-api" \ --upload ${BUILD_ROOT}/patches/0001-Removes-doing-yum-update.patch:/usr/lib/python2.7/site-packages/ \ --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < 0001-Removes-doing-yum-update.patch" \ - --root-password password:stack \ -a undercloud_build.qcow2 mv -f undercloud_build.qcow2 undercloud.qcow2 |