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
0c5a1682
Commit
0c5a1682
authored
Dec 16, 2015
by
Dan Radez
Committed by
Gerrit Code Review
Dec 16, 2015
Browse files
Merge "Fixes various corner cases with clean and deploy"
parents
cefc0238
616fba03
Changes
2
Hide whitespace changes
Inline
Side-by-side
ci/clean.sh
View file @
0c5a1682
...
...
@@ -8,14 +8,14 @@ vm_index=4
# Clean off instack VM
virsh destroy instack 2> /dev/null
||
echo
-n
''
virsh undefine instack
--remove-all-storage
2> /dev/null
||
echo
-n
''
virsh vol-delete instack.qcow2 default 2> /dev/null
virsh vol-delete instack.qcow2
--pool
default 2> /dev/null
rm
-f
/var/lib/libvirt/images/instack.qcow2 2> /dev/null
# Clean off baremetal VMs in case they exist
for
i
in
$(
seq
0
$vm_index
)
;
do
virsh destroy baremetalbrbm_brbm1_
$i
2> /dev/null
||
echo
-n
''
virsh undefine baremetalbrbm_brbm1_
$i
--remove-all-storage
2> /dev/null
||
echo
-n
''
virsh vol-delete baremetalbrbm_brbm1_
${
i
}
.qcow2 default 2> /dev/null
virsh vol-delete baremetalbrbm_brbm1_
${
i
}
.qcow2
--pool
default 2> /dev/null
rm
-f
/var/lib/libvirt/images/baremetalbrbm_brbm1_
${
i
}
.qcow2 2> /dev/null
done
...
...
ci/deploy.sh
View file @
0c5a1682
...
...
@@ -335,8 +335,15 @@ function setup_instack_vm {
# get the instack VM IP
UNDERCLOUD
=
$(
grep
instack /var/lib/libvirt/dnsmasq/default.leases |
awk
'{print $3}'
|
head
-n
1
)
if
[
-z
"
$UNDERCLOUD
"
]
;
then
echo
"
\n\n
Never got IP for Instack. Can Not Continue."
exit
1
#if not found then dnsmasq may be using leasefile-ro
instack_mac
=
$(
virsh domiflist instack |
grep
default |
\
grep
-Eo
"[0-9a-f
\]
+:[0-9a-f
\]
+:[0-9a-f
\]
+:[0-9a-f
\]
+:[0-9a-f
\]
+:[0-9a-f
\]
+"
)
UNDERCLOUD
=
$(
arp
-e
|
grep
${
instack_mac
}
|
awk
{
'print $1'
}
)
if
[
-z
"
$UNDERCLOUD
"
]
;
then
echo
"
\n\n
Never got IP for Instack. Can Not Continue."
exit
1
fi
else
echo
-e
"
${
blue
}
\r
Instack VM has IP
$UNDERCLOUD
${
reset
}
"
fi
...
...
@@ -584,7 +591,7 @@ parse_cmdline() {
done
if
[[
!
-z
"
$NETENV
"
&&
"
$net_isolation_enabled
"
==
"FALSE"
]]
;
then
echo
-e
"{red}
WARN
: Single flat network requested
, but netenv specified.
Ignoring netenv settings!
${
reset
}
"
echo
-e
"
$
{
red
}
INFO
: Single flat network requested
.
Ignoring
any
netenv settings!
${
reset
}
"
elif
[[
!
-z
"
$NETENV
"
&&
!
-z
"
$DEPLOY_SETTINGS_FILE
"
]]
;
then
echo
-e
"
${
red
}
WARN: deploy_settings and netenv specified. Ignoring netenv settings! deploy_settings will contain
\
netenv
${
reset
}
"
...
...
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