diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-05-12 12:37:33 -0400 |
|---|---|---|
| committer |   Feng Pan <fpan@redhat.com> | 2017-05-30 16:36:11 -0400 |
| commit | 8f2cffd3681baffd44ab6fb1e9d91d899053753b (patch) | |
| tree | 03d9969f04a355af246fee6f1cca49d006859100 /build/undercloud.sh | |
| parent | a622216b83fd46d3ad1fd763a367cc26323a8864 (diff) | |
Moving to forks on gerrit.opnfv.org
Migrating off of github onto opnfv.org to host our forked
projects that are side loaded into our builds
apex-tripleo-heat-templates: Ic65cfeee4a55e993629f831c8c9d9addf6f3dff4
apex-puppet-tripleo: If498c41d706c8f14a5b0bbee64cb4d26cd78c2d0
apex-os-net-config: I5281a57640f388e984b061702362f9c82d08da78
Change-Id: Ieb5cf293ad06d90fce7a9467e32ac0f2d8731a0a
Signed-off-by: Dan Radez <dradez@redhat.com>
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build/undercloud.sh')
| -rwxr-xr-x | build/undercloud.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh index 8d82bcac..0e1a2e35 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -10,7 +10,6 @@ set -xe source ./cache.sh source ./variables.sh -source ./functions.sh populate_cache "$rdo_images_uri/undercloud.qcow2" if [ ! -d "$BUILD_DIR" ]; then mkdir ${BUILD_DIR}; fi @@ -18,27 +17,27 @@ cp -f ${CACHE_DIR}/undercloud.qcow2 ${BUILD_DIR}/undercloud_build.qcow2 pushd ${BUILD_DIR} > /dev/null -# prep opnfv-tht for undercloud -clone_fork opnfv-tht -pushd opnfv-tht > /dev/null -git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${BUILD_DIR}/opnfv-tht.tar.gz +# prep apex-tht for undercloud +python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates +pushd apex-tripleo-heat-templates > /dev/null +git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz popd > /dev/null # inject rt_kvm kernel rpm name into the enable file sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml | tee ${BUILD_DIR}/enable_rt_kvm.yaml # Turn off GSSAPI Auth in sshd -# installing forked opnfv-tht +# installing forked apex-tht # enabling ceph OSDs to live on the controller # seeding configuration files specific to OPNFV # Add performance image scripts LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ - --upload ${BUILD_DIR}/opnfv-tht.tar.gz:/usr/share \ + --upload ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz:/usr/share \ --install "openstack-utils" \ --install "ceph-common" \ - --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf opnfv-tht.tar.gz" \ + --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf apex-tripleo-heat-templates.tar.gz" \ --run-command "sed -i '/ControllerEnableCephStorage/c\\ ControllerEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \ --run-command "sed -i '/ComputeEnableCephStorage/c\\ ComputeEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \ --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \ |