openstack/instack-undercloud
Code Issues Proposed changes

Create nodes as x86_64 instead of amd64

Browse Source
This commit is contained in:
James Slagle 2014-09-24 14:07:46 -04:00
parent 53d0e02b5e
commit 287c1e3ab3
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README-source.md
View File

@ -20,6 +20,8 @@ instack-undercloud via source
cd instack
git clone https://github.com/agroup/instack-undercloud
git clone https://git.openstack.org/openstack/tripleo-incubator
# Pull down a needed patch for x86_64 support since discovered nodes are registered as x86_64 in Ironic.
pushd tripleo-incubator && git fetch https://review.openstack.org/openstack/tripleo-incubator refs/changes/03/123803/1 && git cherry-pick FETCH_HEAD && popd
1. Complete the initial setup.

1
instack-sourcerc
View File

@ -44,6 +44,7 @@ export PIP_DOWNLOAD_CACHE=~/.cache/pip
if [ "$LKG" = "1" ]; then
# These are set manually, since they're not part of source-repositories
export DIB_REPOREF_tripleo_image_elements=4b3d93e144b3452509048e5f9f5a10fcb93ded5c
export DIB_REPOREF_tripleo_heat_templates=6e766483306ae0dabd4fff47f9234ede588f7be4
export DIB_REPOREF_diskimage_builder=41ba1d2b9c0bee5738bec921f2a1114e772a3ab8
export DIB_REPOREF_os_cloud_config=4a03e6b129c91a7269b6103a1f85fd011ec92c91
export DIB_REPOREF_tripleo_incubator=9f3f00eb6c21528d1cda9b80958da5088e8d25cf

5
scripts/instack-install-undercloud-source
View File

@ -125,6 +125,11 @@ if [ ! -d $INSTACK_ROOT/tripleo-incubator ]; then
# https://review.openstack.org/#/c/122846/
git fetch https://review.openstack.org/openstack/tripleo-incubator refs/changes/46/122846/1 && git cherry-pick FETCH_HEAD
## create-nodes x86_64 support
#
# https://review.openstack.org/#/c/123803/
git fetch https://review.openstack.org/openstack/tripleo-incubator refs/changes/03/123803/1 && git cherry-pick FETCH_HEAD
popd
fi

2
scripts/instack-prepare-for-overcloud
View File

@ -71,7 +71,7 @@ if [ "$DEPLOYMENT_MODE" = "poc" ]; then
deploy_ramdisk_id=$(glance image-show bm-deploy-ramdisk | awk ' / id / {print $4}')
nova flavor-key baremetal set \
"cpu_arch"="amd64" \
"cpu_arch"="x86_64" \
"baremetal:deploy_kernel_id"="$deploy_kernel_id" \
"baremetal:deploy_ramdisk_id"="$deploy_ramdisk_id"
fi

2
scripts/instack-virt-setup
View File

@ -41,7 +41,7 @@ fi
source $DEVTEST_VARIABLES
export NODE_ARCH=${NODE_ARCH:-amd64}
export NODE_ARCH=${NODE_ARCH:-x86_64}
export NODE_MEM=${NODE_MEM:-3072}
export TE_DATAFILE=instackenv.json