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
46b80eeb
Commit
46b80eeb
authored
Dec 03, 2015
by
Dan Radez
Browse files
adding build deps that have had to be installed manually
Change-Id: I1af7ffdb1d1e4b96b31b44f2750de23b55d9d540
parent
15ed73f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
build/instack.sh
View file @
46b80eeb
...
...
@@ -9,7 +9,7 @@ RDO_RELEASE=liberty
SSH_OPTIONS
=(
-o
StrictHostKeyChecking
=
no
-o
GlobalKnownHostsFile
=
/dev/null
-o
UserKnownHostsFile
=
/dev/null
)
# check for dependancy packages
for
i
in
libguestfs-tools
;
do
for
i
in
libguestfs-tools
python-docutils bsdtar
;
do
if
!
rpm
-q
$i
>
/dev/null
;
then
sudo
yum
install
-y
$i
fi
...
...
@@ -212,7 +212,7 @@ for i in opendaylight python-networking-odl; do
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
exit
1
fi
done
rm
-rf
puppet-opendaylight
...
...
ci/deploy.sh
View file @
46b80eeb
...
...
@@ -253,7 +253,7 @@ print data['nodes'][$i]['mac'][0]"
old_mac
=
$(
python
-c
"
$pyscript
"
)
new_mac
=
$(
virsh dumpxml baremetalbrbm_brbm1_
$i
|
grep
"mac address"
|
cut
-d
=
-f2
|
grep
-Eo
"[0-9a-f:]+"
)
# this doesn't work with multiple vnics on the vms
# this doesn't work with multiple vnics on the vms
#if [ "$old_mac" != "$new_mac" ]; then
# echo "${blue}Modifying MAC for node from $old_mac to ${new_mac}${reset}"
# sed -i 's/'"$old_mac"'/'"$new_mac"'/' $CONFIG/instackenv-virt.json
...
...
@@ -344,7 +344,7 @@ parse_cmdline() {
;;
-c
|
--config
)
CONFIG
=
$2
echo
"Deployment Configuration Directory Overridden to:
$2
"
echo
"Deployment Configuration Directory Overridden to:
$2
"
shift
2
;;
-i
|
--instackenv
)
...
...
@@ -357,22 +357,22 @@ parse_cmdline() {
;;
-p
|
--ping-site
)
ping_site
=
$2
echo
"Using
$2
as the ping site"
echo
"Using
$2
as the ping site"
shift
2
;;
-r
|
--resources
)
RESOURCES
=
$2
echo
"Deployment Resources Directory Overridden to:
$2
"
echo
"Deployment Resources Directory Overridden to:
$2
"
shift
2
;;
-v
|
--virtual
)
virtual
=
"TRUE"
echo
"Executing a Virtualized Deployment"
echo
"Executing a Virtualized Deployment"
shift
1
;;
--no-ha
)
ha_enabled
=
"FALSE"
echo
"HA Deployment Disabled"
ha_enabled
=
"FALSE"
echo
"HA Deployment Disabled"
shift
1
;;
*
)
...
...
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