Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SNAPS
apex
Commits
347201e1
Commit
347201e1
authored
Nov 11, 2015
by
Tim Rozet
Committed by
Gerrit Code Review
Nov 11, 2015
Browse files
Merge "adding the opendaylight integration"
parents
c37b85a4
f579df75
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
build/Makefile
View file @
347201e1
...
...
@@ -115,8 +115,10 @@ rpm:
tar
-u
--xform
=
"s:stack/ironic-python-agent.kernel:opnfv-apex-
$(RPMVERS)
/build/stack/ironic-python-agent.kernel:"
--file
=
opnfv-apex.tar stack/ironic-python-agent.kernel
tar
-u
--xform
=
"s:stack/ironic-python-agent.vmlinuz:opnfv-apex-
$(RPMVERS)
/build/stack/ironic-python-agent.vmlinuz:"
--file
=
opnfv-apex.tar stack/ironic-python-agent.vmlinuz
tar
-u
--xform
=
"s:stack/overcloud-full.initrd:opnfv-apex-
$(RPMVERS)
/build/stack/overcloud-full.initrd:"
--file
=
opnfv-apex.tar stack/overcloud-full.initrd
tar
-u
--xform
=
"s:stack/overcloud-full.qcow2:opnfv-apex-
$(RPMVERS)
/build/stack/overcloud-full.qcow2:"
--file
=
opnfv-apex.tar stack/overcloud-full.qcow2
tar
-u
--xform
=
"s:stack/overcloud-full
-odl
.qcow2:opnfv-apex-
$(RPMVERS)
/build/stack/overcloud-full.qcow2:"
--file
=
opnfv-apex.tar stack/overcloud-full
-odl
.qcow2
tar
-u
--xform
=
"s:stack/overcloud-full.vmlinuz:opnfv-apex-
$(RPMVERS)
/build/stack/overcloud-full.vmlinuz:"
--file
=
opnfv-apex.tar stack/overcloud-full.vmlinuz
tar
-u
--xform
=
"s:opendaylight.yaml:opnfv-apex-
$(RPMVERS)
/build/opendaylight.yaml:"
--file
=
opnfv-apex.tar opendaylight.yaml
tar
-u
--xform
=
"s:opendaylight.patch:opnfv-apex-
$(RPMVERS)
/build/opendaylight.patch:"
--file
=
opnfv-apex.tar opendaylight.patch
gzip
-f
opnfv-apex.tar
rpmbuild
-ba
opnfv-apex.spec
-D
'_topdir %(echo `pwd`)'
-D
'_builddir %(echo `pwd`)'
-D
'_sourcedir %(echo `pwd`)'
-D
'_rpmdir %(echo `pwd`)'
-D
'_specdir %(echo `pwd`)'
-D
'_srcrpmdir %(echo `pwd`)'
-D
"release
$(
shell
echo
$(REVSTATE)
| tr -d '_-'
)
"
...
...
build/instack.sh
View file @
347201e1
...
...
@@ -57,9 +57,17 @@ elif [ "$1" == "-master" ]; then
sudo
curl
-o
/etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7-liberty/current-passed-ci/delorean.repo
sudo
curl
-o
/etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo
sudo rm
-f
/etc/yum.repos.d/delorean-current.repo
fi
# install the opendaylight yum repo definition
cat
<<
'
EOF
' | sudo tee /etc/yum.repos.d/opendaylight.repo
[opendaylight]
name=OpenDaylight
$releasever
-
$basearch
baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/
$basearch
/os/
enabled=1
gpgcheck=0
EOF
# ensure the undercloud package is installed so we can build the undercloud
if
!
rpm
-q
instack-undercloud
>
/dev/null
;
then
sudo
yum
install
-y
python-tripleoclient
...
...
@@ -187,6 +195,27 @@ for i in $IMAGES; do
curl https://repos.fedorapeople.org/repos/openstack-m/rdo-images-centos-liberty/
$i
-z
stack/
$i
-o
stack/
$i
--verbose
--silent
--location
done
#Adding OpenDaylight to overcloud
pushd
stack
cp
overcloud-full.qcow2 overcloud-full-odl.qcow2
for
i
in
opendaylight python-networking-odl
;
do
yumdownloader
$i
if
rpmfile
=
$(
ls
-r
$i
*
)
;
then
rpmfile
=
$(
echo
$rpmfile
|
head
-n1
)
LIBGUESTFS_BACKEND
=
direct virt-customize
--upload
$rpmfile
:/tmp
--install
/tmp/
$rpmfile
-a
overcloud-full-odl.qcow2
else
echo
"Cannot install
$i
into overcloud-full image."
exit
1
fi
done
rm
-rf
puppet-opendaylight
git clone https://github.com/dfarrell07/puppet-opendaylight
pushd
puppet-opendaylight
git archive
--format
=
tar.gz
--prefix
=
opendaylight/ HEAD
>
../puppet-opendaylight.tar.gz
popd
LIBGUESTFS_BACKEND
=
direct virt-customize
--upload
puppet-opendaylight.tar.gz:/etc/puppet/modules/
--run-command
"cd /etc/puppet/modules/; tar xzf puppet-opendaylight.tar.gz"
-a
overcloud-full-odl.qcow2
popd
# move and Sanitize private keys from instack.json file
mv
stack/instackenv.json instackenv-virt.json
sed
-i
'/pm_password/c\ "pm_password": "INSERT_STACK_USER_PRIV_KEY",'
instackenv-virt.json
...
...
build/opendaylight.patch
0 → 100644
View file @
347201e1
This diff is collapsed.
Click to expand it.
build/opendaylight.yaml
0 → 100644
View file @
347201e1
parameters
:
ExtraConfig
:
neutron_mechanism_drivers
:
[
'
opendaylight'
]
neutron_tenant_network_type
:
vxlan
build/opnfv-apex.spec
View file @
347201e1
...
...
@@ -35,6 +35,8 @@ cp build/instack.xml %{buildroot}%{_var}/opt/opnfv/
cp build/baremetalbrbm_*.xml %{buildroot}%{_var}/opt/opnfv/
cp build/brbm-net.xml %{buildroot}%{_var}/opt/opnfv/
cp build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/
cp build/opendaylight.yaml %{buildroot}%{_var}/opt/opnfv/
cp build/opendaylight.patch %{buildroot}%{_var}/opt/opnfv/
cp build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/
cp build/stack/deploy-ramdisk-ironic.initramfs %{buildroot}%{_var}/opt/opnfv/stack/
...
...
@@ -54,6 +56,8 @@ cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/
%{_var}/opt/opnfv/baremetalbrbm_*.xml
%{_var}/opt/opnfv/brbm-net.xml
%{_var}/opt/opnfv/default-pool.xml
%{_var}/opt/opnfv/opendaylight.yaml
%{_var}/opt/opnfv/opendaylight.patch
%{_var}/opt/opnfv/instackenv-virt.json
%{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.initramfs
%{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.kernel
...
...
ci/deploy.sh
View file @
347201e1
...
...
@@ -198,6 +198,14 @@ function copy_materials {
scp
${
SSH_OPTIONS
[@]
}
$RESOURCES
/overcloud-full.initrd
"stack@
$UNDERCLOUD
"
:
scp
${
SSH_OPTIONS
[@]
}
$RESOURCES
/overcloud-full.qcow2
"stack@
$UNDERCLOUD
"
:
scp
${
SSH_OPTIONS
[@]
}
$RESOURCES
/overcloud-full.vmlinuz
"stack@
$UNDERCLOUD
"
:
scp
${
SSH_OPTIONS
[@]
}
$CONFIG
/opendaylight.yaml
"stack@
$UNDERCLOUD
"
:
## WORK AROUND
# when OpenDaylight lands in upstream RDO manager this can be removed
# apply the opendaylight patch
scp
${
SSH_OPTIONS
[@]
}
$CONFIG
/opendaylight.patch
"root@
$UNDERCLOUD
"
:
ssh
-T
${
SSH_OPTIONS
[@]
}
"root@
$UNDERCLOUD
"
"cd /usr/share/openstack-tripleo-heat-templates/; patch -Np1 < /root/opendaylight.patch"
## END WORK AROUND
# ensure stack user on instack machine has an ssh key
ssh
-T
${
SSH_OPTIONS
[@]
}
"stack@
$UNDERCLOUD
"
"if [ ! -e ~/.ssh/id_rsa.pub ]; then ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa; fi"
...
...
@@ -264,7 +272,7 @@ echo "Configuring nameserver on ctlplane network"
neutron subnet-update
\$
(neutron subnet-list | grep -v id | grep -v
\\\\
-
\\\\
- | awk {'print
\$
2'}) --dns-nameserver 8.8.8.8
echo "Executing overcloud deployment, this should run for an extended period without output."
sleep 60 #wait for Hypervisor stats to check-in to nova
openstack overcloud deploy --templates
$DEPLOY_OPTIONS
openstack overcloud deploy --templates
$DEPLOY_OPTIONS
-e opendaylight.yaml
EOI
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment