diff --git a/doc/install-guide/section_ceilometer-cinder.xml b/doc/install-guide/section_ceilometer-cinder.xml index 6ad5693425..89220825de 100644 --- a/doc/install-guide/section_ceilometer-cinder.xml +++ b/doc/install-guide/section_ceilometer-cinder.xml @@ -11,22 +11,28 @@ Storage service to send notifications to the bus. Edit /etc/cinder/cinder.conf - and add in the [DEFAULT] section: + and add in the [DEFAULT] section on the controller + and volume nodes: control_exchange = cinder notification_driver = cinder.openstack.common.notifier.rpc_notifier - Run the following commands: - # openstack-config --set /etc/cinder/cinder.conf DEFAULT control_exchange cinder + Run the following commands on + the controller and volume nodes: + # openstack-config --set /etc/cinder/cinder.conf DEFAULT control_exchange cinder # openstack-config --set /etc/cinder/cinder.conf DEFAULT notification_driver cinder.openstack.common.notifier.rpc_notifier Restart the Block Storage services with their new - settings: - # service cinder-volume restart -# service cinder-api restart + settings. + On the controller node: + # service cinder-api restart +# service cinder-scheduler restart # service openstack-cinder-api restart -# service openstack-cinder-volume restart +# service openstack-cinder-scheduler restart + On the volume node: + # service openstack-cinder-volume restart + # service cinder-volume restart diff --git a/doc/install-guide/section_ceilometer-glance.xml b/doc/install-guide/section_ceilometer-glance.xml index 4272f8a5af..46b7b77add 100644 --- a/doc/install-guide/section_ceilometer-glance.xml +++ b/doc/install-guide/section_ceilometer-glance.xml @@ -28,8 +28,8 @@ rabbit_password = RABBIT_PASS - Restart the Image Services with their new - settings: + Restart the Image Services with their new + settings: # service glance-registry restart # service glance-api restart # service openstack-glance-api restart diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml index 6200d46e89..8e0493dbe5 100644 --- a/doc/install-guide/section_ceilometer-install.xml +++ b/doc/install-guide/section_ceilometer-install.xml @@ -17,7 +17,8 @@ Install the Telemetry service on the controller node: - # apt-get install ceilometer-api ceilometer-collector ceilometer-agent-central python-ceilometerclient + # apt-get install ceilometer-api ceilometer-collector ceilometer-agent-central \ + ceilometer-alarm-evaluator ceilometer-alarm-notifier python-ceilometerclient # yum install openstack-ceilometer-api openstack-ceilometer-collector openstack-ceilometer-central python-ceilometerclient # zypper install openstack-ceilometer-api openstack-ceilometer-collector \ openstack-ceilometer-agent-central python-ceilometerclient \ @@ -59,9 +60,7 @@ take effect: # service mongodb stop -# rm /var/lib/mongodb/journal/j._0 -# rm /var/lib/mongodb/journal/prealloc.1 -# rm /var/lib/mongodb/journal/prealloc,2 +# rm /var/lib/mongodb/journal/prealloc.* # service mongodb start For more information on the @@ -124,17 +123,17 @@ connection = mongodb://ceilometer:CEILOMETER_DBPASS@< store it in the configuration file: # CEILOMETER_TOKEN=$(openssl rand -hex 10) # echo $CEILOMETER_TOKEN -# openstack-config --set /etc/ceilometer/ceilometer.conf publisher_rpc metering_secret $CEILOMETER_TOKEN +# openstack-config --set /etc/ceilometer/ceilometer.conf publisher metering_secret $CEILOMETER_TOKEN For SUSE Linux Enterprise, run the following command: # CEILOMETER_TOKEN=$(openssl rand 10|hexdump -e '1/1 "%.2x"') # openssl rand -hex 10 Edit the /etc/ceilometer/ceilometer.conf file - and change the [publisher_rpc] section. Replace + and change the [publisher] section. Replace CEILOMETER_TOKEN with the results of the openssl command: - [publisher_rpc] + [publisher] # Secret value for signing metering messages (string value) metering_secret = CEILOMETER_TOKEN @@ -185,6 +184,8 @@ log_dir = /var/log/ceilometer keystone_authtoken auth_uri http://controller:5000 # openstack-config --set /etc/ceilometer/ceilometer.conf \ keystone_authtoken admin_password CEILOMETER_PASS +# openstack-config --set /etc/ceilometer/ceilometer.conf \ + service_credentials os_auth_url http://controller:5000/v2.0 # openstack-config --set /etc/ceilometer/ceilometer.conf \ service_credentials os_username ceilometer # openstack-config --set /etc/ceilometer/ceilometer.conf \ @@ -206,6 +207,7 @@ admin_password = CEILOMETER_PASS Also set the [service_credentials] section: [service_credentials] +os_auth_url = http://controller:5000/v2.0 os_username = ceilometer os_tenant_name = service os_password = CEILOMETER_PASS @@ -227,7 +229,9 @@ os_password = CEILOMETER_PASS Restart the services with their new settings: # service ceilometer-agent-central restart # service ceilometer-api restart -# service ceilometer-collector restart +# service ceilometer-collector restart +# service ceilometer-alarm-evaluator restart +# service ceilometer-alarm-notifier restart Start the You must set the secret key that you defined previously. The Telemetry service nodes share this key as a shared secret: - # openstack-config --set /etc/ceilometer/ceilometer.conf publisher_rpc metering_secret $CEILOMETER_TOKEN + # openstack-config --set /etc/ceilometer/ceilometer.conf publisher \ + metering_secret CEILOMETER_TOKEN Edit the /etc/ceilometer/ceilometer.conf file - and change these lines in the [DEFAULT] + and change these lines in the [publisher] section. Replace CEILOMETER_TOKEN with the ceilometer token that you created previously: - [publisher_rpc] + [publisher] # Secret value for signing metering messages (string value) metering_secret = CEILOMETER_TOKEN