openstack/training-labs
Code Issues Proposed changes

Fixes from openstack-manuals stable/newton

Browse Source 
- Replace oslo_messaging_rabbit settings with transport_url
- Drop enabled_apis which is rdo/obs only
- Remove log-dir (not logdir) config line

Change-Id: I91bb1fe129514f05afcb269b928c1419a575b97f
This commit is contained in:
Roger Luethi
2017-03-05 13:11:09 +01:00
parent 13715417cb
commit 909fa389a4
7 changed files with 24 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
labs/osbash/scripts/ubuntu/setup_cinder_controller.sh
View File

@@ -100,12 +100,8 @@ conf=/etc/cinder/cinder.conf
echo "Setting database connection: $database_url."
iniset_sudo $conf database connection "$database_url"
# Configure [DEFAULT] section to use RabbitMQ message broker.
iniset_sudo $conf DEFAULT rpc_backend rabbit
iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
iniset_sudo $conf DEFAULT auth_strategy keystone

8
labs/osbash/scripts/ubuntu/setup_cinder_volumes.sh
View File

@@ -79,12 +79,8 @@ cinder_admin_user=cinder
echo "Setting database connection: $database_url."
iniset_sudo $conf database connection "$database_url"
# Configure [DEFAULT] section.
iniset_sudo $conf DEFAULT rpc_backend rabbit
iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
iniset_sudo $conf DEFAULT auth_strategy keystone

9
labs/osbash/scripts/ubuntu/setup_heat_controller.sh
View File

@@ -142,13 +142,8 @@ iniset_sudo $conf database connection "$database_url"
echo "Configuring keystone."
# Configure [DEFAULT] section.
iniset_sudo $conf DEFAULT rpc_backend rabbit
# Configure [oslo_messaging_rabbit] section.
iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
# Configure [keystone_authtoken] section.
iniset_sudo $conf keystone_authtoken auth_uri http://controller:5000

8
labs/osbash/scripts/ubuntu/setup_neutron_compute.sh
View File

@@ -30,12 +30,8 @@ echo "Configuring neutron for compute node."
conf=/etc/neutron/neutron.conf
echo "Configuring $conf."
# Configure AMQP parameters
iniset_sudo $conf DEFAULT rpc_backend rabbit
iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
# Configuring [DEFAULT] section
iniset_sudo $conf DEFAULT auth_strategy keystone

17
labs/osbash/scripts/ubuntu/setup_nova_compute.sh
View File

@@ -32,14 +32,8 @@ echo "Configuring nova for compute node."
conf=/etc/nova/nova.conf
echo "Configuring $conf."
# Configure [DEFAULT] section.
iniset_sudo $conf DEFAULT enabled_apis osapi_compute,metadata
iniset_sudo $conf DEFAULT rpc_backend rabbit
# Configure [oslo_messaging_rabbit] section.
iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
# Configuring [DEFAULT] section.
iniset_sudo $conf DEFAULT auth_strategy keystone
@@ -78,8 +72,11 @@ iniset_sudo $conf glance api_servers http://controller:9292
# Configure [oslo_concurrency] section.
iniset_sudo $conf oslo_concurrency lock_path /var/lib/nova/tmp
# Delete logdir line
sudo sed -i "/^logdir/ d" $conf
# 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

21
labs/osbash/scripts/ubuntu/setup_nova_controller.sh
View File

@@ -75,9 +75,6 @@ sudo apt install -y nova-api nova-conductor nova-consoleauth \
conf=/etc/nova/nova.conf
# Configure [DEFAULT] section.
iniset_sudo $conf DEFAULT enabled_apis osapi_compute,metadata
# Configure [api_database] section.
database_url="mysql+pymysql://$NOVA_DB_USER:$NOVA_DBPASS@controller/nova_api"
echo "Setting API database connection: $database_url."
@@ -90,13 +87,8 @@ iniset_sudo $conf database connection "$database_url"
echo "Configuring nova services."
# Configure [DEFAULT] section.
iniset_sudo $conf DEFAULT rpc_backend rabbit
# Configure [oslo_messaging_rabbit] section.
iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
# Configure [DEFAULT] section.
iniset_sudo $conf DEFAULT auth_strategy keystone
@@ -127,10 +119,11 @@ iniset_sudo $conf glance api_servers http://controller:9292
# Configure [oslo_concurrency] section.
iniset_sudo $conf oslo_concurrency lock_path /var/lib/nova/tmp
# Delete logdir line
# According to install-guide, "Due to a packaging bug, remove the logdir option
# from the [DEFAULT] section."
sudo sed -i "/^logdir/ d" $conf
# 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
echo "Populating the Compute databases."
sudo nova-manage api_db sync

8
labs/osbash/scripts/ubuntu/setup_self-service_controller.sh
View File

@@ -53,12 +53,8 @@ iniset_sudo $conf DEFAULT core_plugin ml2
iniset_sudo $conf DEFAULT service_plugins router
iniset_sudo $conf DEFAULT allow_overlapping_ips True
iniset_sudo $conf DEFAULT rpc_backend rabbit
# Configure [oslo_messaging_rabbit] section.
iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
echo "Configuring RabbitMQ message queue access."
iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
# Configuring [DEFAULT] section.
iniset_sudo $conf DEFAULT auth_strategy keystone