diff --git a/deploy-virt-overcloudrc b/deploy-virt-overcloudrc deleted file mode 100644 index 217cccddb..000000000 --- a/deploy-virt-overcloudrc +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -export NODES_JSON=instackenv.json -export NeutronPublicInterface=eth0 -export OVERCLOUD_LIBVIRT_TYPE=qemu -export UNDERCLOUD_NAMESERVER=192.168.122.1 -export NETWORK_CIDR=10.0.0.0/8 -export FLOATING_IP_START=192.0.2.45 -export FLOATING_IP_END=192.0.2.64 -export FLOATING_IP_CIDR=192.0.2.0/24 -export BM_NETWORK_GATEWAY=192.0.2.1 -export NEUTRON_NETWORK_TYPE=gre -export NEUTRON_TUNNEL_TYPES=gre -export COMPUTESCALE=1 -export BLOCKSTORAGESCALE=0 -export SWIFTSTORAGESCALE=0 diff --git a/doc/source/deploy-overcloud.rst b/doc/source/deploy-overcloud.rst index fb5c9aba3..1760870bf 100644 --- a/doc/source/deploy-overcloud.rst +++ b/doc/source/deploy-overcloud.rst @@ -31,6 +31,11 @@ Create the necessary flavors:: instack-ironic-deployment --setup-flavors +If installing on baremetal, copy the sample overcloudrc file and edit to reflect your environment. Then source this file:: + + cp /usr/share/instack-undercloud/deploy-baremetal-overcloudrc ~/deploy-overcloudrc + source deploy-overcloudrc + Deploy the the *openstack-full* image (default of 1 compute and 1 control):: instack-deploy-overcloud diff --git a/elements/instack-vm/install.d/51-instack-files b/elements/instack-vm/install.d/51-instack-files index 453a974cc..198d431cc 100755 --- a/elements/instack-vm/install.d/51-instack-files +++ b/elements/instack-vm/install.d/51-instack-files @@ -17,7 +17,6 @@ visudo -c mkdir -p /home/stack/.ssh cp /tmp/in_target.d/id_rsa_virt_power /home/stack/.ssh/id_rsa_virt_power cp /tmp/in_target.d/id_rsa_virt_power.pub /home/stack/.ssh/id_rsa_virt_power.pub -cp /tmp/in_target.d/deploy-virt-overcloudrc /home/stack/deploy-overcloudrc cp /tmp/in_target.d/instack.answers.sample /home/stack/instack.answers cp /tmp/in_target.d/$TE_DATAFILE /home/stack/instackenv.json diff --git a/live/instack-livecd.ks b/live/instack-livecd.ks index cd5a8223a..b85c63ac5 100644 --- a/live/instack-livecd.ks +++ b/live/instack-livecd.ks @@ -39,7 +39,6 @@ ssh-keygen -t rsa -N "" -f /home/stack/id_rsa_virt_power curl -o /etc/yum.repos.d/slagle-openstack-m.repo https://copr.fedoraproject.org/coprs/slagle/openstack-m/repo/fedora-20/slagle-openstack-m-fedora-20.repo yum -y install instack-undercloud cp /usr/share/instack-undercloud/instack.answers.sample /home/stack/instack.answers -cp /usr/share/instack-undercloud/deploy-virt-overcloudrc /home/stack/deploy-overcloudrc # instack-install-undercloud sources ~/instack.answers, and during the # %chroot phase, apparently ~ evaluates to /tmp. So, we need to copy the # answers file there as well. diff --git a/live/instack-source-livecd.ks b/live/instack-source-livecd.ks index 5f2f99e59..163bf28f9 100644 --- a/live/instack-source-livecd.ks +++ b/live/instack-source-livecd.ks @@ -98,7 +98,6 @@ ssh-keygen -t rsa -N "" -f /home/stack/virtual-power-key curl -o /etc/yum.repos.d/slagle-openstack-m.repo https://copr.fedoraproject.org/coprs/slagle/openstack-m/repo/fedora-20/slagle-openstack-m-fedora-20.repo yum -y install https://slagle.fedorapeople.org/copr/instack-undercloud-1.0.10-1.fc20.noarch.rpm cp /usr/share/doc/instack-undercloud/instack.answers.sample /home/stack/instack.answers -cp /usr/share/doc/instack-undercloud/deploy-virt-overcloudrc /home/stack/deploy-overcloudrc # instack-install-undercloud sources ~/instack.answers, and during the # %chroot phase, apparently ~ evaluates to /tmp. So, we need to copy the # answers file there as well. diff --git a/scripts/instack-deploy-overcloud b/scripts/instack-deploy-overcloud index 5fc325ecb..69dbcfc9d 100755 --- a/scripts/instack-deploy-overcloud +++ b/scripts/instack-deploy-overcloud @@ -304,11 +304,11 @@ tripleo setup-endpoints $OVERCLOUD_IP \ keystone role-create --name heat_stack_user # setup-neutron "" "" 10.0.0.0/8 "" "" "" "" 192.0.2.45 192.0.2.64 192.0.2.0/24 NETWORK_CIDR=${NETWORK_CIDR:-"10.0.0.0/8"} -FLOATING_IP_START=${FLOATING_IP_START:-"172.17.0.45"} -FLOATING_IP_END=${FLOATING_IP_END:-"172.17.0.64"} -FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-"172.17.0.0/16"} +FLOATING_IP_START=${FLOATING_IP_START:-"192.0.2.45"} +FLOATING_IP_END=${FLOATING_IP_END:-"192.0.2.64"} +FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-"192.0.2.0/24"} OVERCLOUD_NAMESERVER="8.8.8.8" -BM_NETWORK_GATEWAY=${BM_NETWORK_GATEWAY:-"172.17.0.1"} +BM_NETWORK_GATEWAY=${BM_NETWORK_GATEWAY:-"192.0.2.1"} NETWORK_JSON=$(mktemp) jq "." < $NETWORK_JSON diff --git a/scripts/instack-virt-setup b/scripts/instack-virt-setup index 31f8bb699..66246932b 100755 --- a/scripts/instack-virt-setup +++ b/scripts/instack-virt-setup @@ -6,12 +6,10 @@ export LIBVIRT_DEFAULT_URI="qemu:///system" if [ ! -d "/usr/share/instack-undercloud" ]; then DEVTEST_VARIABLES=/usr/libexec/openstack-tripleo/devtest_variables.sh - export RCFILE=$(dirname $0)/../deploy-virt-overcloudrc export ANSWERSFILE=$(dirname $0)/../instack.answers.sample export ELEMENTS_PATH="$(realpath $(dirname $0)/../elements):/usr/share/tripleo-image-elements:/usr/share/diskimage-builder/elements" else DEVTEST_VARIABLES=/usr/libexec/openstack-tripleo/devtest_variables.sh - export RCFILE=/usr/share/instack-undercloud/deploy-virt-overcloudrc export ANSWERSFILE=/usr/share/instack-undercloud/instack.answers.sample export ELEMENTS_PATH="/usr/share/instack-undercloud:/usr/share/tripleo-image-elements:/usr/share/diskimage-builder/elements" fi @@ -101,13 +99,9 @@ sudo chown -R $USER: ~/.ssh sudo virsh undefine --remove-all-storage seed -# Save number of overcloud VMs to make following two "for" cycles flexible +# Save number of overcloud VMs to make the following for loop flexible VM_LAST_NUMBER=$((NODE_COUNT-1)) -MACS=$(for i in $(seq 0 VM_LAST_NUMBER); do echo -n $(tripleo get-vm-mac baremetal_$i)" "; done) -cp $RCFILE /tmp/deploy-virt-overcloudrc -sed -i "s/MACS=\"\"/MACS=\"$MACS\"/" /tmp/deploy-virt-overcloudrc - # Attach disks for os-disk-config testing for i in $(seq 0 VM_LAST_NUMBER); do qcow_file=/var/lib/libvirt/images/baremetal_extra_${i}.qcow2 diff --git a/setup.cfg b/setup.cfg index 22c835e93..a135a4b8d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,5 +39,4 @@ data_files = share/instack-undercloud/json-files = json-files/* share/instack-undercloud/jenkins-jobs = jenkins-jobs/* share/instack-undercloud/ = instack.answers.sample - share/instack-undercloud/ = deploy-virt-overcloudrc share/instack-undercloud/ = deploy-baremetal-overcloudrc