diff options
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index e5f9134b..f26a72a3 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -42,7 +42,7 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb-l2.yaml" fi else - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-l3.yaml" + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight.yaml" fi SDN_IMAGE=opendaylight elif [ "${deploy_options_array['sdn_controller']}" == 'opendaylight-external' ]; then @@ -256,22 +256,20 @@ EOI # Set ODL version accordingly if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && -n "${deploy_options_array['odl_version']}" ]]; then case "${deploy_options_array['odl_version']}" in - beryllium) odl_version='' + carbon) odl_version='' ;; - boron) odl_version='boron' - ;; - carbon) odl_version='master' - ;; - *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon' or 'boron' values.${reset}" + *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon'.${reset}" exit 1 ;; esac - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \ - --run-command "yum -y install /root/${odl_version}/*" \ - -a overcloud-full.qcow2 + if [[ -n "$odl_version" ]]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \ + --run-command "yum -y install /root/${odl_version}/*" \ + -a overcloud-full.qcow2 EOI + fi fi # Override ODL if we enable netvirt for fdio @@ -333,6 +331,9 @@ EOI DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" if [[ "$virtual" == "TRUE" ]]; then DEPLOY_OPTIONS+=" -e virtual-environment.yaml" + # double check the status of the vbmc devices + # TODO add some validation logic here + vbmc list fi echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}" @@ -356,33 +357,25 @@ echo "Uploading overcloud glance images" openstack overcloud image upload echo "Configuring undercloud and discovering nodes" -openstack baremetal import --json instackenv.json + if [[ -z "$virtual" ]]; then - openstack baremetal introspection bulk start - if [[ -n "$root_disk_list" ]]; then - openstack baremetal configure boot --root-device=${root_disk_list} - else - openstack baremetal configure boot - fi + openstack overcloud node import instackenv.json + openstack overcloud node introspect --all-manageable --provide + #if [[ -n "$root_disk_list" ]]; then + # TODO: replace node configure boot with ironic node-update + # TODO: configure boot is not used in ocata here anymore + #openstack overcloud node configure boot --root-device=${root_disk_list} + #https://github.com/openstack/tripleo-quickstart-extras/blob/master/roles/overcloud-prep-images/templates/overcloud-prep-images.sh.j2#L73-L130 + #ironic node-update $ironic_node add properties/root_device='{"{{ node['key'] }}": "{{ node['value'] }}"}' + #fi else - openstack baremetal configure boot + openstack overcloud node import --provide instackenv.json fi -echo "Configuring flavors" -for flavor in baremetal control compute; do - echo -e "${blue}INFO: Updating flavor: \${flavor}${reset}" - if openstack flavor list | grep \${flavor}; then - openstack flavor delete \${flavor} - fi - openstack flavor create --id auto --ram 4096 --disk 39 --vcpus 1 \${flavor} - if ! openstack flavor list | grep \${flavor}; then - echo -e "${red}ERROR: Unable to create flavor \${flavor}${reset}" - fi -done -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 +openstack flavor set --property "cpu_arch"="x86_64" baremetal +openstack flavor set --property "cpu_arch"="x86_64" control +openstack flavor set --property "cpu_arch"="x86_64" compute echo "Configuring nameserver on ctlplane network" dns_server_ext='' for dns_server in ${dns_servers}; do @@ -390,7 +383,7 @@ for dns_server in ${dns_servers}; do done neutron subnet-update \$(neutron subnet-list | grep -Ev "id|tenant|external|storage" | grep -v \\\\-\\\\- | awk {'print \$2'}) \${dns_server_ext} sed -i '/CloudDomain:/c\ CloudDomain: '${domain_name} ${ENV_FILE} -echo "Executing overcloud deployment, this should run for an extended period without output." +echo "Executing overcloud deployment, this could run for an extended period without output." sleep 60 #wait for Hypervisor stats to check-in to nova # save deploy command so it can be used for debugging cat > deploy_command << EOF |