Merge branch 'staging' into 'master'

Update Clear Containers for Docker to v1.9.0 and add Fedora 23.

See merge request !9

source/gs-clear-containers-gettting-started.rst

@@ -18,7 +18,7 @@ or better. However, binaries for a range of operating systems are available from
 Currently experimental builds are available for:
 
 - CentOS*, Scientific Linux* 7
-- Fedora* 21, 22
+- Fedora* 21, 22, 23
 - openSUSE* 13.1, 13.2, Tumbleweed
 - SUSE* Linux Enterprise 12
 - Debian* 8.0
@@ -69,7 +69,7 @@ instructions below:
 Source Code
 ===========
 
-The experimental source code is based on the Docker version 1.8.1 upstream release and is available at:
+The experimental source code is based on the Docker version 1.9.0 upstream release and is available at:
 
 - https://github.com/clearlinux/docker
 

source/openstack_telemetry_compute.rst

@@ -0,0 +1,82 @@
+OpenStack* Telemetry - Enable compute service meters
+############################################################
+
+Telemetry uses a combination of notifications and an agent to
+collect Compute meters. Perform these steps on each compute node.
+
+Configure components
+-----------------------------------------------
+
+Edit the ``/etc/ceilometer/ceilometer.conf`` file and complete the following actions:
+
+#. In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, configure RabbitMQ message queue access::
+
+    [DEFAULT]
+    ...
+    rpc_backend = rabbit
+
+    [oslo_messaging_rabbit]
+    ...
+    rabbit_host = controller
+    rabbit_userid = openstack
+    rabbit_password = RABBIT_PASS
+
+   Replace the ``RABBIT_PASS`` with the password you chose for the openstack account in RabbitMQ.
+
+#. In the ``[DEFAULT]`` and ``[keystone_authtoken]`` sections, configure Identity service access::
+
+    [DEFAULT]
+    ...
+    auth_strategy = keystone
+
+    [keystone_authtoken]
+    ...
+    auth_uri = http://controller:5000
+    auth_url = http://controller:35357
+    auth_plugin = password
+    project_domain_id = default
+    user_domain_id = default
+    project_name = service
+    username = ceilometer
+    password = CEILOMETER_PASS
+
+   Replace ``CEILOMETER_PASS`` with the password you chose for the Telemetry service database.
+
+#. In the ``[service_credentials]`` section, configure service credentials::
+
+    [service_credentials]
+    ...
+    os_auth_url = http://controller:5000/v2.0
+    os_username = ceilometer
+    os_tenant_name = service
+    os_password = CEILOMETER_PASS
+    os_endpoint_type = internalURL
+    os_region_name = RegionOne
+
+   Replace ``CEILOMETER_PASS`` with the password you chose for the ceilometer user in the Identity service.
+
+
+Configure Compute to use Telemetry
+-----------------------------------------------
+
+#. Edit the ``/etc/nova/nova.conf`` file and configure notifications in the ``[DEFAULT]`` section::
+
+    [DEFAULT]
+    ...
+    instance_usage_audit = True
+    instance_usage_audit_period = hour
+    notify_on_state_change = vm_and_task_state
+    notification_driver = messagingv2
+
+
+Finalize the installation
+-----------------------------------------------
+
+#. Restart the agent::
+
+    # systemctl enable ceilometer-agent-compute.service
+    # systemctl restart ceilometer-agent-compute.service
+
+#. Restart the compute service::
+
+   	# systemctl restart nova-compute.service

source/openstack_telemetry_image.rst

@@ -0,0 +1,35 @@
+OpenStack* Telemetry - Enable image service meters
+############################################################
+
+Telemetry uses notifications to collect Image service meters.
+Perform these steps on the controller node.
+
+
+Configure the Image service to use Telemetry
+-----------------------------------------------
+
+Edit the ``/etc/glance/glance-api.conf`` and ``/etc/glance/glance-registry.conf``
+files and complete the following actions:
+
+#. In the ``[DEFAULT]`` section, configure notifications and RabbitMQ message broker access::
+
+    [DEFAULT]
+    ...
+    notification_driver = messagingv2
+    rpc_backend = rabbit
+
+    [oslo_messaging_rabbit]
+    ...
+    rabbit_host = controller
+    rabbit_userid = openstack
+    rabbit_password = RABBIT_PASS
+
+   Replace the ``RABBIT_PASS`` with the password you chose for the openstack account in RabbitMQ.
+
+Finalize the installation
+----------------------------
+
+#. Restart the image service::
+
+   	# systemctl restart glance-registry.service
+   	# systemctl restart glance-api.service

source/openstack_telemetry_verify.rst

@@ -0,0 +1,59 @@
+OpenStack* Telemetry - Verify Operation
+############################################################
+
+Verify Operation
+------------------
+
+Verify operation of the Telemetry service. These steps only include the Image service meters to reduce clutter. Environments with ceilometer integration for additional services contain more meters.
+
+
+#. Source the ``admin`` credentials to gain access to admin-only CLI
+   commands::
+
+   	$ source admin-openrc.sh
+
+#. List available meters::
+
+    $ ceilometer meter-list
+    +--------------+-------+-------+--------------------------------------+---------+------------+
+    | Name         | Type  | Unit  | Resource ID                          | User ID | Project ID |
+    +--------------+-------+-------+--------------------------------------+---------+------------+
+    | image        | gauge | image | acafc7c0-40aa-4026-9673-b879898e1fc2 | None    | cf12a15... |
+    | image.size   | gauge | B     | acafc7c0-40aa-4026-9673-b879898e1fc2 | None    | cf12a15... |
+    +--------------+-------+-------+--------------------------------------+---------+------------+
+
+#. Download the CirrOS image from the Image service::
+
+    $ IMAGE_ID=$(glance image-list | grep 'cirros' | awk '{ print $2 }')
+    $ glance image-download $IMAGE_ID > /tmp/cirros.img
+
+#. List available meters again to validate detection of the image download::
+
+    $ ceilometer meter-list
+    +----------------+-------+-------+--------------------------------------+---------+------------+
+    | Name           | Type  | Unit  | Resource ID                          | User ID | Project ID |
+    +----------------+-------+-------+--------------------------------------+---------+------------+
+    | image          | gauge | image | acafc7c0-40aa-4026-9673-b879898e1fc2 | None    | cf12a15... |
+    | image.download | delta | B     | acafc7c0-40aa-4026-9673-b879898e1fc2 | None    | cf12a15... |
+    | image.serve    | delta | B     | acafc7c0-40aa-4026-9673-b879898e1fc2 | None    | cf12a15... |
+    | image.size     | gauge | B     | acafc7c0-40aa-4026-9673-b879898e1fc2 | None    | cf12a15... |
+    +----------------+-------+-------+--------------------------------------+---------+------------+
+
+#. Retrieve usage statistics from the image.download meter::
+
+    $ ceilometer statistics -m image.download -p 60
+
+    +--------+---------------------+---------------------+------------+------------+------------+------------+-------+----------+----------------------------+----------------------------+
+    | Period | Period Start        | Period End          | Max        | Min        | Avg        | Sum        | Count | Duration | Duration Start             | Duration End               |
+    +--------+---------------------+---------------------+------------+------------+------------+------------+-------+----------+----------------------------+----------------------------+
+    | 60     | 2015-04-21T12:21:45 | 2015-04-21T12:22:45 | 13200896.0 | 13200896.0 | 13200896.0 | 13200896.0 | 1     | 0.0      | 2015-04-21T12:22:12.983000 | 2015-04-21T12:22:12.983000 |
+    +--------+---------------------+---------------------+------------+------------+------------+------------+-------+----------+----------------------------+----------------------------+
+
+#. Remove the previously downloaded image file /tmp/cirros.img::
+
+    $ rm /tmp/cirros.img
+
+
+
+
+