Update for tripleo wrapper script and instack-* script prefix
This commit is contained in:
James Slagle
parent
2787e7df29
commit
8577dadb72
|
|
@ -14,7 +14,7 @@ script itself.
|
|||
re-downloading images if they already exist in the current working directory.
|
||||
If you want to force a redownload of the images, delete them first.
|
||||
|
||||
prepare-for-overcloud
|
||||
instack-prepare-for-overcloud
|
||||
|
||||
1. If you're testing an all VM setup, copy the ssh key for the virtual power
|
||||
driver user to your authorized keys file. Define $UNDERCLOUD_IP for your
|
||||
|
|
@ -41,9 +41,9 @@ environment. Skip this step if you are using all baremetal.
|
|||
# FLOATING_IP_START: floating ip allocation start
|
||||
# FLOATING_IP_END: floating ip allocation end
|
||||
# FLOATING_IP_CIDR: floating ip network cidr
|
||||
deploy-overcloud
|
||||
instack-deploy-overcloud
|
||||
|
||||
1. Run the test-overcloud script to launch a cirros image on the overcloud and
|
||||
wait until it pings successfully
|
||||
|
||||
test-overcloud
|
||||
instack-test-overcloud
|
||||
|
|
|
|||
10
Overcloud.md
10
Overcloud.md
|
|
@ -19,7 +19,7 @@ scripts/deploy-overcloud.
|
|||
|
||||
4. Add your ssh key pair to nova
|
||||
|
||||
user-config
|
||||
tripleo user-config
|
||||
|
||||
5. Download the deployment kernel and ramdisk
|
||||
|
||||
|
|
@ -33,8 +33,8 @@ scripts/deploy-overcloud.
|
|||
|
||||
5. Load images into glance
|
||||
|
||||
load-image overcloud-control.qcow2
|
||||
load-image overcloud-compute.qcow2
|
||||
tripleo load-image overcloud-control.qcow2
|
||||
tripleo load-image overcloud-compute.qcow2
|
||||
|
||||
6. Use the setup-baremetal script to add your baremetal nodes
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ scripts/deploy-overcloud.
|
|||
# $MACS and $PM_* variables should be in the same node order, e.g., the
|
||||
# first MAC address should correspond to the first power management
|
||||
# IP, etc.
|
||||
setup-baremetal $CPU $MEM $DISK $ARCH "$MACS" undercloud "$PM_IPS" "$PM_USERS" "$PM_PASSWORDS"
|
||||
tripleo setup-baremetal $CPU $MEM $DISK $ARCH "$MACS" undercloud "$PM_IPS" "$PM_USERS" "$PM_PASSWORDS"
|
||||
|
||||
7. Create your overcloud heat template. You can adjust COMPUTESCALE to launch
|
||||
more than one compute node if you choose to.
|
||||
|
|
@ -60,7 +60,7 @@ scripts/deploy-overcloud.
|
|||
|
||||
8. Create and source the overcloud passwords
|
||||
|
||||
setup-overcloud-passwords
|
||||
tripleo setup-overcloud-passwords
|
||||
source tripleo-overcloud-passwords
|
||||
|
||||
9. Deploy the overcloud
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Undercloud Install via instack
|
|||
the sceen. It also logs to ~/.instack/install-undercloud.log. You should see
|
||||
`install-undercloud Complete!` at the end of a successful run.
|
||||
|
||||
install-undercloud-packages
|
||||
instack-install-undercloud-packages
|
||||
|
||||
4. Configure tuskar. Edit /etc/tuskar/tuskar.conf so the following settings are enabled:
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Undercloud Install via instack
|
|||
the sceen. It also logs to ~/.instack/install-undercloud.log. You should see
|
||||
`install-undercloud Complete!` at the end of a successful run.
|
||||
|
||||
instack-undercloud/scripts/install-undercloud
|
||||
instack-undercloud/scripts/instack-install-undercloud
|
||||
|
||||
|
||||
That completes the Undercloud install. To proceed with deploying and using the
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@ MACS=${MACS:-"52:54:00:b5:bd:f0 52:54:00:f2:be:f0"}
|
|||
PM_IPS=${PM_IPS:-}
|
||||
PM_USERS=${PM_USERS:-}
|
||||
PM_PASSWORDS=${PM_PASSWORDS:-}
|
||||
setup-baremetal $CPU $MEM $DISK $ARCH "$MACS" undercloud "$PM_IPS" "$PM_USERS" "$PM_PASSWORDS"
|
||||
tripleo setup-baremetal $CPU $MEM $DISK $ARCH "$MACS" undercloud "$PM_IPS" "$PM_USERS" "$PM_PASSWORDS"
|
||||
|
||||
# Must wait for baremetal nodes to register as nova hypervisors
|
||||
sleep 60
|
||||
|
||||
setup-overcloud-passwords -o
|
||||
tripleo setup-overcloud-passwords -o
|
||||
source tripleo-overcloud-passwords
|
||||
|
||||
# Define the interface that will be bridged onto the Neutron defined
|
||||
|
|
@ -58,7 +58,7 @@ heat stack-create -f $OVERCLOUD_YAML_PATH \
|
|||
-P NovaComputeLibvirtType=$OVERCLOUD_LIBVIRT_TYPE \
|
||||
overcloud
|
||||
|
||||
wait_for 220 10 stack-ready overcloud
|
||||
tripleo wait_for 220 10 tripleo stack-ready overcloud
|
||||
|
||||
echo "Overcloud CREATE_COMPLETE"
|
||||
|
||||
|
|
@ -79,10 +79,10 @@ source $TRIPLEO_ROOT/overcloudrc
|
|||
export no_proxy=${no_proxy:-""}
|
||||
export no_proxy=$no_proxy,$OVERCLOUD_IP
|
||||
|
||||
init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
|
||||
tripleo init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
|
||||
$OVERCLOUD_IP admin@example.com heat-admin@$OVERCLOUD_IP \
|
||||
${SSLBASE:+--ssl $PUBLIC_API_URL}
|
||||
setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
|
||||
tripleo setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
|
||||
--glance-password $OVERCLOUD_GLANCE_PASSWORD \
|
||||
--heat-password $OVERCLOUD_HEAT_PASSWORD \
|
||||
--neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
|
||||
|
|
@ -95,7 +95,7 @@ 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"}
|
||||
setup-neutron "" "" $NETWORK_CIDR "" "" "" $FLOATING_IP_START $FLOATING_IP_END $FLOATING_IP_CIDR
|
||||
tripleo setup-neutron "" "" $NETWORK_CIDR "" "" "" $FLOATING_IP_START $FLOATING_IP_END $FLOATING_IP_CIDR
|
||||
|
||||
nova flavor-delete m1.tiny
|
||||
nova flavor-create m1.tiny 1 512 2 1
|
||||
|
|
@ -14,12 +14,12 @@ MACS=${MACS:-}
|
|||
PM_IPS=${PM_IPS:-}
|
||||
PM_USERS=${PM_USERS:-}
|
||||
PM_PASSWORDS=${PM_PASSWORDS:-}
|
||||
setup-baremetal $CPU $MEM $DISK $ARCH "$MACS" undercloud "$PM_IPS" "$PM_USERS" "$PM_PASSWORDS"
|
||||
tripleo setup-baremetal $CPU $MEM $DISK $ARCH "$MACS" undercloud "$PM_IPS" "$PM_USERS" "$PM_PASSWORDS"
|
||||
|
||||
# Must wait for baremetal nodes to register as nova hypervisors
|
||||
sleep 60
|
||||
|
||||
setup-overcloud-passwords -o
|
||||
tripleo setup-overcloud-passwords -o
|
||||
source tripleo-overcloud-passwords
|
||||
|
||||
# Define the interface that will be bridged onto the Neutron defined
|
||||
|
|
@ -72,8 +72,7 @@ tuskar overcloud-create overcloud \
|
|||
--roles $compute_role_id=1 \
|
||||
--roles $blockstorage_role_id=1;
|
||||
|
||||
|
||||
wait_for 220 10 stack-ready overcloud
|
||||
tripleo wait_for 220 10 tripleo stack-ready overcloud
|
||||
|
||||
echo "Overcloud CREATE_COMPLETE"
|
||||
|
||||
|
|
@ -94,10 +93,10 @@ source $TRIPLEO_ROOT/overcloudrc
|
|||
export no_proxy=${no_proxy:-""}
|
||||
export no_proxy=$no_proxy,$OVERCLOUD_IP
|
||||
|
||||
init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
|
||||
tripleo init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
|
||||
$OVERCLOUD_IP admin@example.com heat-admin@$OVERCLOUD_IP \
|
||||
${SSLBASE:+--ssl $PUBLIC_API_URL}
|
||||
setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
|
||||
tripleo setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
|
||||
--glance-password $OVERCLOUD_GLANCE_PASSWORD \
|
||||
--heat-password $OVERCLOUD_HEAT_PASSWORD \
|
||||
--neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
|
||||
|
|
@ -110,7 +109,7 @@ 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"}
|
||||
setup-neutron "" "" $NETWORK_CIDR "" "" "" $FLOATING_IP_START $FLOATING_IP_END $FLOATING_IP_CIDR
|
||||
tripleo setup-neutron "" "" $NETWORK_CIDR "" "" "" $FLOATING_IP_START $FLOATING_IP_END $FLOATING_IP_CIDR
|
||||
|
||||
nova flavor-delete m1.tiny
|
||||
nova flavor-create m1.tiny 1 512 2 1
|
||||
|
|
@ -9,7 +9,7 @@ if [ ! -f ~/.ssh/id_rsa ]; then
|
|||
ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
|
||||
fi
|
||||
|
||||
user-config
|
||||
tripleo user-config
|
||||
|
||||
if [ ! -f deploy-ramdisk.initramfs ]; then
|
||||
curl -L -O http://file.rdu.redhat.com/~jslagle/tripleo-images-rdo-icehouse/deploy-ramdisk.initramfs
|
||||
|
|
@ -31,6 +31,6 @@ if [ ! -f overcloud-cinder-volume.qcow2 ]; then
|
|||
curl -L -O http://file.rdu.redhat.com/~rbrady/tripleo-images-rdo-icehouse/overcloud-cinder-volume.qcow2
|
||||
fi
|
||||
|
||||
load-image overcloud-control.qcow2
|
||||
load-image overcloud-compute.qcow2
|
||||
load-image overcloud-cinder-volume.qcow2
|
||||
tripleo load-image overcloud-control.qcow2
|
||||
tripleo load-image overcloud-compute.qcow2
|
||||
tripleo load-image overcloud-cinder-volume.qcow2
|
||||
|
|
@ -19,7 +19,7 @@ source $TRIPLEO_ROOT/overcloudrc
|
|||
export no_proxy=${no_proxy:-""}
|
||||
export no_proxy=$no_proxy,$OVERCLOUD_IP
|
||||
|
||||
os-adduser -p $OVERCLOUD_DEMO_PASSWORD demo demo@example.com
|
||||
tripleo os-adduser -p $OVERCLOUD_DEMO_PASSWORD demo demo@example.com
|
||||
|
||||
if [ ! -f cirros-0.3.0-x86_64-disk.img ]; then
|
||||
curl -L -O https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img
|
||||
|
|
@ -28,13 +28,13 @@ fi
|
|||
glance image-create --name user --public --disk-format qcow2 \
|
||||
--container-format bare --file cirros-0.3.0-x86_64-disk.img
|
||||
|
||||
wait_for 30 10 nova service-list --binary nova-compute 2\>/dev/null \| grep 'enabled.*\ up\ '
|
||||
tripleo wait_for 30 10 nova service-list --binary nova-compute 2\>/dev/null \| grep 'enabled.*\ up\ '
|
||||
|
||||
wait_for 30 10 neutron agent-list -f csv -c alive -c agent_type -c host \| grep "\":-).*Open vSwitch agent.*overcloud-novacompute\""
|
||||
tripleo wait_for 30 10 neutron agent-list -f csv -c alive -c agent_type -c host \| grep "\":-).*Open vSwitch agent.*overcloud-novacompute\""
|
||||
|
||||
source $TRIPLEO_ROOT/overcloudrc-user
|
||||
|
||||
user-config
|
||||
tripleo user-config
|
||||
|
||||
nova boot --key-name default --flavor m1.tiny --image user demo
|
||||
|
||||
|
|
@ -47,4 +47,4 @@ neutron security-group-rule-create default --protocol icmp \
|
|||
neutron security-group-rule-create default --protocol tcp \
|
||||
--direction ingress --port-range-min 22 --port-range-max 22
|
||||
|
||||
wait_for 30 10 ping -c 1 $FLOATINGIP
|
||||
tripleo wait_for 30 10 ping -c 1 $FLOATINGIP
|
||||
Loading…
Reference in New Issue