nova install changes from upstream docs

The following changes from the openstack/nova repo have been integrated:

1423f920bb0485229ceaf19b9a0b7786dfa0cfd6
  Remove useless TODO section

a71af2beada0ac46d7154994abbf955e9dfd99ac
  doc: Capitalize keystone domain name

97ca86fad75dd601f6d38de95bb6a6709f0fdf80
  Modifying install-guide to include public endpoint for identity service

632150aaa842f13d1c90691cdf771134e689ce6a
  doc: Fix nova-manage cell_v2 list_cells output

This changeset also removes checks for os_region_name which are no longer
needed.

Change-Id: I6499fa655ae1ad9c8d20d8745fbdc0fffaa014f2
This commit is contained in:
Roger Luethi 2019-11-27 08:21:01 +01:00
parent dab21c2aee
commit 2a5dca3d7f
2 changed files with 9 additions and 26 deletions

View File

@ -35,12 +35,6 @@ echo "Configuring $conf."
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
if sudo grep "^os_region_name" $conf; then
sudo sed -i '/^os_region_name/ s/os_region_name/region_name/' $conf
else
echo "WARNING os_region_name change no longer needed for $conf"
fi
# Configuring [api] section.
iniset_sudo $conf api auth_strategy keystone
@ -49,11 +43,12 @@ nova_admin_user=nova
MY_MGMT_IP=$(get_node_ip_in_network "$(hostname)" "mgmt")
# Configure [keystone_authtoken] section.
iniset_sudo $conf keystone_authtoken auth_url http://controller:5000
iniset_sudo $conf keystone_authtoken www_authenticate_uri http://controller:5000/
iniset_sudo $conf keystone_authtoken auth_url http://controller:5000/
iniset_sudo $conf keystone_authtoken memcached_servers controller:11211
iniset_sudo $conf keystone_authtoken auth_type password
iniset_sudo $conf keystone_authtoken project_domain_name default
iniset_sudo $conf keystone_authtoken user_domain_name default
iniset_sudo $conf keystone_authtoken project_domain_name Default
iniset_sudo $conf keystone_authtoken user_domain_name Default
iniset_sudo $conf keystone_authtoken project_name "$SERVICE_PROJECT_NAME"
iniset_sudo $conf keystone_authtoken username "$nova_admin_user"
iniset_sudo $conf keystone_authtoken password "$NOVA_PASS"
@ -88,13 +83,6 @@ iniset_sudo $conf placement auth_url http://controller:5000/v3
iniset_sudo $conf placement username "$placement_admin_user"
iniset_sudo $conf placement password "$PLACEMENT_PASS"
# Delete log_dir line
# According to the install-guide, "Due to a packaging bug, remove the log_dir
# option from the [DEFAULT] section."
sudo grep "^log_dir" $conf
sudo sed -i "/^log_dir/ d" $conf
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Finalize installation
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View File

@ -139,23 +139,18 @@ iniset_sudo $conf placement_database connection "$database_url"
echo "Configuring nova services."
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
if sudo grep "^os_region_name" $conf; then
sudo sed -i '/^os_region_name/ s/os_region_name/region_name/' $conf
else
echo "WARNING os_region_name change no longer needed for $conf"
fi
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller:5672"
# Configure [api] section.
iniset_sudo $conf api auth_strategy keystone
# Configure [keystone_authtoken] section.
iniset_sudo $conf keystone_authtoken auth_url http://controller:5000
iniset_sudo $conf keystone_authtoken www_authenticate_uri http://controller:5000/
iniset_sudo $conf keystone_authtoken auth_url http://controller:5000/
iniset_sudo $conf keystone_authtoken memcached_servers controller:11211
iniset_sudo $conf keystone_authtoken auth_type password
iniset_sudo $conf keystone_authtoken project_domain_name default
iniset_sudo $conf keystone_authtoken user_domain_name default
iniset_sudo $conf keystone_authtoken project_domain_name Default
iniset_sudo $conf keystone_authtoken user_domain_name Default
iniset_sudo $conf keystone_authtoken project_name "$SERVICE_PROJECT_NAME"
iniset_sudo $conf keystone_authtoken username "$nova_admin_user"
iniset_sudo $conf keystone_authtoken password "$NOVA_PASS"