summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 7b72e7be..47b82353 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -184,7 +184,8 @@ parse_inventory_file() {
\"disk\": \"$(eval echo \${${node}disk})\",
\"arch\": \"$(eval echo \${${node}arch})\",
\"pm_user\": \"$(eval echo \${${node}ipmi_user})\",
- \"pm_addr\": \"$(eval echo \${${node}ipmi_ip})\"
+ \"pm_addr\": \"$(eval echo \${${node}ipmi_ip})\",
+ \"capabilities\": \"$(eval echo \${${node}capabilities})\"
"
instack_env_output+=${node_output}
if [ $node_count -lt $node_total ]; then
@@ -522,6 +523,10 @@ function undercloud_prep_overcloud_deploy {
DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
fi
+ if [[ ! "$virtual" == "TRUE" ]]; then
+ DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
+ fi
+
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
source stackrc
set -o errexit
@@ -533,7 +538,11 @@ openstack baremetal configure boot
openstack baremetal introspection bulk start
echo "Configuring flavors"
openstack flavor list | grep baremetal || openstack flavor create --id auto --ram 4096 --disk 39 --vcpus 1 baremetal
+openstack flavor list | grep control || openstack flavor create --id auto --ram 4096 --disk 39 --vcpus 1 control
+openstack flavor list | grep compute || openstack flavor create --id auto --ram 4096 --disk 39 --vcpus 1 compute
openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boot_option"="local" baremetal
+openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boot_option"="local" --property "capabilities:profile"="control" control
+openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boot_option"="local" --property "capabilities:profile"="compute" compute
echo "Configuring nameserver on ctlplane network"
neutron subnet-update \$(neutron subnet-list | grep -v id | grep -v \\\\-\\\\- | awk {'print \$2'}) --dns-nameserver 8.8.8.8
echo "Executing overcloud deployment, this should run for an extended period without output."