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
24e05320
Commit
24e05320
authored
Oct 16, 2015
by
Tim Rozet
Committed by
Gerrit Code Review
Oct 16, 2015
Browse files
Merge "updates to the instack VM"
parents
b27ac55a
b8592145
Changes
3
Show whitespace changes
Inline
Side-by-side
build/Makefile
View file @
24e05320
...
...
@@ -132,8 +132,6 @@ instack-clean:
rm
-f
baremetalbrbm_1.xml
rm
-f
instack.xml
rm
-f
instack.qcow2
rm
-rf
stack
.PHONY
:
iso
iso
:
build-clean instack.qcow2 rpm $(ISOCACHE)
...
...
build/instack.sh
View file @
24e05320
...
...
@@ -77,7 +77,7 @@ virsh destroy baremetalbrbm_0 2> /dev/null || echo -n ''
virsh undefine baremetalbrbm_0 --remove-all-storage 2> /dev/null || echo -n ''
virsh destroy baremetalbrbm_1 2> /dev/null || echo -n ''
virsh undefine baremetalbrbm_1 --remove-all-storage 2> /dev/null || echo -n ''
instack-virt-setup
NODE_CPU=2 NODE_MEM=8192
instack-virt-setup
EOI
# attach undercloud to the underlay network for
...
...
@@ -125,6 +125,9 @@ EOI
# install undercloud on Undercloud VM
ssh
-T
${
SSH_OPTIONS
[@]
}
"stack@
$UNDERCLOUD
"
"openstack undercloud install"
# Clean cache to reduce the images size
ssh
-T
${
SSH_OPTIONS
[@]
}
"root@
$UNDERCLOUD
"
"yum clean all"
# make a copy of instack VM's definitions, and disk image
# it must be stopped to make a copy of its disk image
ssh
-T
${
SSH_OPTIONS
[@]
}
stack@localhost
<<
EOI
...
...
@@ -147,7 +150,6 @@ fi
echo "
\n
Copying instack disk image and starting instack VM."
virsh dumpxml baremetalbrbm_0 > baremetalbrbm_0.xml
virsh dumpxml baremetalbrbm_1 > baremetalbrbm_1.xml
cp -f /var/lib/libvirt/images/instack.qcow2 .
virsh dumpxml instack > instack.xml
#virsh vol-dumpxml instack.qcow2 --pool default > instack.qcow2.xml
virsh net-dumpxml brbm > brbm.xml
...
...
@@ -160,8 +162,10 @@ scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_0.xml .
scp
${
SSH_OPTIONS
[@]
}
stack@localhost:baremetalbrbm_1.xml
.
scp
${
SSH_OPTIONS
[@]
}
stack@localhost:instack.xml
.
scp
${
SSH_OPTIONS
[@]
}
stack@localhost:brbm.xml
.
scp
${
SSH_OPTIONS
[@]
}
stack@localhost:instack.qcow2
.
sudo cp
/var/lib/libvirt/images/instack.qcow2 ./instack.qcow2_
sudo chown
$(
whoami
)
:
$(
whoami
)
./instack.qcow2_
virt-sparsify
--check-tmpdir
=
fail ./instack.qcow2_ ./instack.qcow2
rm
-f
./instack.qcow2_
# start the instack VM back up to continue installation
echo
"Waiting for instack VM to start"
...
...
ci/build.sh
View file @
24e05320
...
...
@@ -389,8 +389,11 @@ fi
echo
"Copying built OPNFV .iso file to target directory
${
BUILD_DIR
}
..."
rm
-rf
${
BUILD_DIR
}
mkdir
-p
${
BUILD_DIR
}
cp
${
BUILD_BASE
}
/.versions
${
BUILD_DIR
}
cp
${
RESULT_DIR
}
/
*
.iso
*
${
BUILD_DIR
}
ls
-s
${
BUILD_BASE
}
/.versions
${
BUILD_DIR
}
ls
-s
${
RESULT_DIR
}
/
*
.iso
*
${
BUILD_DIR
}
echo
"Copying built OPNFV .rpm files to target directory
${
BUILD_DIR
}
..."
ls
-s
${
BUILD_BASE
}
/
*
.rpm
${
BUILD_DIR
}
ls
-s
${
BUILD_BASE
}
/noarch/
*
.rpm
${
BUILD_DIR
}
if
[
$POPULATE_CACHE
-eq
1
]
;
then
if
[
!
-z
${
BUILD_CACHE_URI
}
]
;
then
...
...
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