update ceilometer install guide and external service configuration

- change notification_driver option to use messagingv2.
*.openstack.common.* is pre-icehouse option.
- update telemetry get_started guide:
  - generalise supported functions
  - fix notification agent and collector service purpose
- removes references to ceilometermiddleware in swift guide since
  it is a Kilo feature
- removes references to TELEMETRY_SECRET as it is a Kilo change

Closes-Bug: #1425713
Co-Authored-By: Matt Kassawara <mkassawara@gmail.com>
backport: juno
Change-Id: I90dff1b5c2a7dd2943cfa7ff25bb63c08eb7986d

doc/common/section_getstart_telemetry.xml

@@ -9,25 +9,19 @@
       <para>
         <itemizedlist>
           <listitem>
-            <para>Efficiently collects the metering data about the CPU
+            <para>Efficiently polls metering data related to OpenStack
-          and network costs.</para>
+              services.</para>
           </listitem>
           <listitem>
-            <para>Collects data by monitoring notifications sent from
+            <para>Collects event and metering data by monitoring notifications
-          services or by polling the infrastructure.</para>
+              sent from services.</para>
           </listitem>
           <listitem>
-            <para>Configures the type of collected data to meet
+            <para>Publishes collected data to various targets including data
-          various operating requirements. It accesses and inserts the
+              stores and message queues.</para>
-          metering data through the REST API.</para>
           </listitem>
           <listitem>
-            <para>Expands the framework to collect custom usage data
+            <para>Creates alarms when collected data breaks defined rules.</para>
-          by additional plug-ins.</para>
-          </listitem>
-          <listitem>
-            <para>Produces signed metering messages that cannot be
-          repudiated.</para>
           </listitem>
         </itemizedlist>
      </para>
@@ -45,17 +39,27 @@
            >ceilometer-agent-central</systemitem>)</term>
           <listitem><para>Runs on a central management server to poll for
            resource utilization statistics for resources not tied to instances
-           or compute nodes.</para></listitem>
+           or compute nodes. Multiple agents can be started to scale service
+           horizontally.</para></listitem>
+        </varlistentry>
+        <varlistentry><term>A notification agent (<systemitem class="service"
+           >ceilometer-agent-notification</systemitem>)</term>
+          <listitem><para>Runs on a central management server(s) and consumes
+            messages from the message queue(s) to build event and metering data.
+          </para></listitem>
         </varlistentry>
         <varlistentry><term>A collector (<systemitem class="service"
            >ceilometer-collector</systemitem>)</term>
-          <listitem><para>Runs on central management server(s) to monitor the
+          <listitem><para>Runs on central management server(s) and dispatches
-           message queues (for notifications and for metering data coming from
+            collected telemetry data to a data store or external consumer
-           the agent). Notification messages are processed and turned into
+            without modification.</para>
-           metering messages, which are sent to the message bus using the
+          </listitem>
-           appropriate topic. Telemetry messages are written to the data store
+        </varlistentry>
-           without modification.</para>
+        <varlistentry><term>An alarm evaluator (<systemitem class="service"
-        </listitem>
+            >ceilometer-alarm-evaluator</systemitem>)</term>
+          <listitem><para>Runs on one or more central management servers to
+          determine when alarms fire due to the associated statistic
+          trend crossing a threshold over a sliding time window.</para></listitem>
         </varlistentry>
         <varlistentry><term>An alarm notifier (<systemitem class="service"
             >ceilometer-alarm-notifier</systemitem>)</term>
@@ -64,12 +68,6 @@
             collection of samples.</para></listitem>
      </varlistentry>
         <varlistentry>
-          <term>A data store</term>
-          <listitem><para>A database capable of handling
-            concurrent writes (from one or more collector instances)
-            and reads (from the API server).</para></listitem>
-        </varlistentry>
-          <varlistentry>
           <term>An API server (<systemitem
            class="service">ceilometer-api</systemitem>)</term>
           <listitem><para>Runs on one or more central management servers to

doc/install-guide/section_ceilometer-cinder.xml

@@ -3,23 +3,27 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="ceilometer-agent-cinder">
+  xml:id="ceilometer-cinder">
   <?dbhtml stop-chunking?>
-  <title>Add the Block Storage service agent for Telemetry</title>
+  <title>Configure the Block Storage service</title>
+  <para>To retrieve volume-oriented events and samples, you must
+    configure the Block Storage service to send notifications to the
+    message bus. Perform these steps on the controller and storage
+    nodes.</para>
   <procedure>
+    <title>To configure prerequisites</title>
+    <para>Edit the <filename>/etc/cinder/cinder.conf</filename> file
+      and complete the following actions:</para>
     <step>
-      <para>To retrieve volume samples, you must configure the Block
+      <para>In the <literal>[DEFAULT]</literal> section, configure
-        Storage service to send notifications to the bus.</para>
+        notifications:</para>
-      <para>Edit <filename>/etc/cinder/cinder.conf</filename>
+      <programlisting language="ini">[DEFAULT]
-        and add in the <literal>[DEFAULT]</literal> section on the controller
+...
-        and volume nodes:</para>
+control_exchange = cinder
-      <programlisting language="ini">control_exchange = cinder
+notification_driver = messagingv2</programlisting>
-notification_driver = cinder.openstack.common.notifier.rpc_notifier</programlisting>
     </step>
     <step>
-      <para>Restart the Block Storage services with their new
+      <para>Restart the Block Storage services on the controller node:</para>
-        settings.</para>
-      <para>On the controller node:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service cinder-api restart</userinput>
 <prompt>#</prompt> <userinput>service cinder-scheduler restart</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl restart openstack-cinder-api.service openstack-cinder-scheduler.service</userinput></screen>
@@ -28,7 +32,9 @@ notification_driver = cinder.openstack.common.notifier.rpc_notifier</programlist
 <prompt>#</prompt> <userinput>service openstack-cinder-scheduler restart</userinput></screen>
       <para os="opensuse">On openSUSE:</para>
       <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl restart openstack-cinder-api.service openstack-cinder-scheduler.service</userinput></screen>
-      <para>On the storage node:</para>
+    </step>
+    <step>
+      <para>Restart the Block Storage services on the storage nodes:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service cinder-volume restart</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl restart openstack-cinder-volume.service</userinput></screen>
       <para os="sles">On SLES:</para>
@@ -36,11 +42,11 @@ notification_driver = cinder.openstack.common.notifier.rpc_notifier</programlist
       <para os="opensuse">On openSUSE:</para>
       <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl restart openstack-cinder-volume.service</userinput></screen>
     </step>
-      <step>
+    <step>
-       <para>If you want to collect OpenStack Block Storage notification on demand,
+      <para>Use the <command>cinder-volume-usage-audit</command> command to
-            you can use <command>cinder-volume-usage-audit</command> from OpenStack Block Storage.
+        retrieve metrics on demand. For more information, see
-            For more information, <link xlink:href="http://docs.openstack.org/admin-guide-cloud/content/section_telemetry-cinder-audit-script.html"
+        <link xlink:href="http://docs.openstack.org/admin-guide-cloud/content/section_telemetry-cinder-audit-script.html"
-          ><citetitle>Block Storage audit script setup to get notifications</citetitle></link>.</para>
+        ><citetitle>Block Storage audit script setup to get notifications</citetitle></link>.</para>
-      </step>
+    </step>
   </procedure>
 </section>

doc/install-guide/section_ceilometer-glance.xml

@@ -3,21 +3,21 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="ceilometer-agent-glance">
+  xml:id="ceilometer-glance">
-  <title>Configure the Image Service for Telemetry</title>
+  <title>Configure the Image Service</title>
+  <para>To retrieve image-oriented events and samples, configure
+    the Image Service to send notifications to the message bus.
+    Perform these steps on the controller node.</para>
   <procedure>
-    <title>To configure prerequisites</title>
+    <para>Edit the <filename>/etc/glance/glance-api.conf</filename>
-    <para>To retrieve image samples, you must configure the Image
+      and <filename>/etc/glance/glance-registry.conf</filename> files and
-      Service to send notifications to the message broker. Edit the
-      <filename>/etc/glance/glance-api.conf</filename> and
-      <filename>/etc/glance/glance-registry.conf</filename> files and
       complete the following actions:</para>
     <step>
       <para>In the <literal>[DEFAULT]</literal> section, configure
       notifications and RabbitMQ message broker access:</para>
       <programlisting language="ini">[DEFAULT]
 ...
-notification_driver = messaging
+notification_driver = messagingv2
 rpc_backend = rabbit
 rabbit_host = <replaceable>controller</replaceable>
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>

doc/install-guide/section_ceilometer-nova.xml

@@ -3,20 +3,91 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="ceilometer-agent-nova">
+  xml:id="ceilometer-nova">
   <?dbhtml stop-chunking?>
-  <title>Install the Compute agent for Telemetry</title>
+  <title>Configure the Compute service</title>
-  <para>Telemetry is composed of an API service, a collector and a range
+  <para>Telemetry uses a combination of notifications and an agent to
-    of disparate agents. This section explains how to install and configure
+    collect Compute metrics. Perform these steps on each compute node.</para>
-    the agent that runs on the compute node.</para>
   <procedure>
-  <title>To configure prerequisites</title>
+    <title>To install and configure the agent</title>
     <step>
-      <para>Install the package:</para>
+      <para>Install the packages:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install ceilometer-agent-compute</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-ceilometer-compute python-ceilometerclient python-pecan</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-ceilometer-agent-compute</userinput></screen>
     </step>
+    <step>
+      <para>Edit the <filename>/etc/ceilometer/ceilometer.conf</filename>
+        file and complete the following actions:</para>
+      <substeps>
+        <step>
+          <para>In the <literal>[publisher]</literal> section, configure the
+            metering secret:</para>
+          <programlisting language="ini">[publisher]
+...
+metering_secret = <replaceable>METERING_SECRET</replaceable></programlisting>
+          <para>Replace <replaceable>METERING_SECRET</replaceable> with
+          the metering secret you chose for the Telemetry module.</para>
+        </step>
+        <step os="centos;fedora;opensuse;rhel;sles;ubuntu">
+          <para>In the <literal>[DEFAULT]</literal> section, configure
+            <application>RabbitMQ</application> message broker access:</para>
+          <programlisting language="ini">[DEFAULT]
+...
+rabbit_host = <replaceable>controller</replaceable>
+rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
+          <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
+          you chose for the guest account in RabbitMQ.</para>
+        </step>
+        <step>
+          <para>In the <literal>[keystone_authtoken]</literal> section,
+            configure Identity service access:</para>
+          <programlisting language="ini">[keystone_authtoken]
+...
+auth_uri = http://<replaceable>controller</replaceable>:5000/v2.0
+identity_uri = http://<replaceable>controller</replaceable>:35357
+admin_tenant_name = service
+admin_user = ceilometer
+admin_password = <replaceable>CEILOMETER_PASS</replaceable></programlisting>
+          <para>Replace <replaceable>CEILOMETER_PASS</replaceable> with the
+            password you chose for the Telemetry module database.</para>
+          <note>
+            <para>Comment out any <literal>auth_host</literal>,
+              <literal>auth_port</literal>, and
+              <literal>auth_protocol</literal> options because the
+              <literal>identity_uri</literal> option replaces them.</para>
+          </note>
+        </step>
+        <step>
+          <para>In the <literal>[service_credentials]</literal> section,
+            configure service credentials:</para>
+          <programlisting language="ini">[service_credentials]
+...
+os_auth_url = http://<replaceable>controller</replaceable>:5000/v2.0
+os_username = ceilometer
+os_tenant_name = service
+os_password = <replaceable>CEILOMETER_PASS</replaceable>
+os_endpoint_type = internalURL
+os_region_name = regionOne</programlisting>
+          <para>Replace <replaceable>CEILOMETER_PASS</replaceable> with the
+            password you chose for the <literal>ceilometer</literal> user in
+            the Identity service.</para>
+        </step>
+        <step>
+          <para>(Optional) To assist with troubleshooting,
+            enable verbose logging in the <literal>[DEFAULT]</literal>
+            section:</para>
+          <programlisting language="ini">[DEFAULT]
+...
+verbose = True</programlisting>
+        </step>
+      </substeps>
+    </step>
+  </procedure>
+  <procedure>
+    <title>To configure notifications</title>
+    <para>Configure the Compute service to send notifications to the
+      message bus.</para>
     <step>
       <para>Edit the <filename>/etc/nova/nova.conf</filename> file and
         configure notifications in the <literal>[DEFAULT]</literal>
@@ -26,8 +97,26 @@
 instance_usage_audit = True
 instance_usage_audit_period = hour
 notify_on_state_change = vm_and_task_state
-notification_driver = nova.openstack.common.notifier.rpc_notifier
+notification_driver = messagingv2</programlisting>
-notification_driver = ceilometer.compute.nova_notifier</programlisting>
+    </step>
+  </procedure>
+  <procedure>
+    <title>To finalize installation</title>
+    <step os="ubuntu;debian">
+      <para>Restart the agent:</para>
+      <screen><prompt>#</prompt> <userinput>service ceilometer-agent-compute restart</userinput></screen>
+    </step>
+    <step os="rhel;centos;fedora;sles;opensuse">
+      <para>Start the Telemetry agent and configure it to start when the
+        system boots:</para>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-ceilometer-compute.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-ceilometer-compute.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-ceilometer-agent-compute start</userinput>
+<prompt>#</prompt> <userinput>chkconfig openstack-ceilometer-agent-compute on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-ceilometer-compute.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-ceilometer-compute.service</userinput></screen>
     </step>
     <step>
       <para>Restart the Compute service:</para>
@@ -39,89 +128,4 @@ notification_driver = ceilometer.compute.nova_notifier</programlisting>
       <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-compute.service</userinput></screen>
     </step>
   </procedure>
-  <procedure>
-    <title>To configure the Compute agent for Telemetry</title>
-    <para>Edit the <filename>/etc/ceilometer/ceilometer.conf</filename>
-      file and complete the following actions:</para>
-    <step>
-      <para>In the <literal>[publisher]</literal> section, configure the
-        metering secret:</para>
-      <programlisting language="ini">[publisher]
-...
-metering_secret = <replaceable>METERING_SECRET</replaceable></programlisting>
-      <para>Replace <replaceable>METERING_SECRET</replaceable> with
-        the metering secret you chose for the Telemetry module.</para>
-    </step>
-    <step os="centos;fedora;opensuse;rhel;sles;ubuntu">
-      <para>In the <literal>[DEFAULT]</literal> section, configure
-        <application>RabbitMQ</application> message broker access:</para>
-      <programlisting language="ini">[DEFAULT]
-...
-rabbit_host = <replaceable>controller</replaceable>
-rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
-      <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
-        you chose for the guest account in RabbitMQ.</para>
-    </step>
-      <step>
-        <para>In the <literal>[keystone_authtoken]</literal> section,
-          configure Identity service access:</para>
-      <programlisting language="ini">[keystone_authtoken]
-...
-auth_uri = http://<replaceable>controller</replaceable>:5000/v2.0
-identity_uri = http://<replaceable>controller</replaceable>:35357
-admin_tenant_name = service
-admin_user = ceilometer
-admin_password = <replaceable>CEILOMETER_PASS</replaceable></programlisting>
-      <para>Replace <replaceable>CEILOMETER_PASS</replaceable> with the
-        password you chose for the Telemetry module database.</para>
-      <note>
-        <para>Comment out the <literal>auth_host</literal>,
-          <literal>auth_port</literal>, and <literal>auth_protocol</literal>
-          keys, since they are replaced by the <literal>identity_uri</literal>
-          and <literal>auth_uri</literal> keys.</para>
-      </note>
-     </step>
-     <step>
-      <para>In the <literal>[service_credentials]</literal> section,
-        configure service credentials:</para>
-      <programlisting language="ini">[service_credentials]
-...
-os_auth_url = http://<replaceable>controller</replaceable>:5000/v2.0
-os_username = ceilometer
-os_tenant_name = service
-os_password = <replaceable>CEILOMETER_PASS</replaceable>
-os_endpoint_type = internalURL
-os_region_name = regionOne</programlisting>
-    <para>Replace <replaceable>CEILOMETER_PASS</replaceable> with the password
-      you chose for the <literal>ceilometer</literal> user in the Identity
-      service.</para>
-    </step>
-    <step>
-      <para>(Optional) To assist with troubleshooting,
-        enable verbose logging in the <literal>[DEFAULT]</literal>
-        section:</para>
-      <programlisting language="ini">[DEFAULT]
-...
-verbose = True</programlisting>
-    </step>
-  </procedure>
-  <procedure>
-    <title>To finalize installation</title>
-    <step os="ubuntu;debian">
-      <para>Restart the Telemetry service:</para>
-      <screen><prompt>#</prompt> <userinput>service ceilometer-agent-compute restart</userinput></screen>
-    </step>
-    <step os="rhel;centos;fedora;sles;opensuse">
-      <para>Start the Telemetry service and configure it to start when the
-        system boots:</para>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-ceilometer-compute.service</userinput>
-<prompt>#</prompt> <userinput>systemctl start openstack-ceilometer-compute.service</userinput></screen>
-      <para os="sles">On SLES:</para>
-      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-ceilometer-agent-compute start</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-ceilometer-agent-compute on</userinput></screen>
-      <para os="opensuse">On openSUSE:</para>
-      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-ceilometer-compute.service</userinput>
-<prompt>#</prompt> <userinput>systemctl start openstack-ceilometer-compute.service</userinput></screen>
-    </step>
-  </procedure>
 </section>

doc/install-guide/section_ceilometer-swift.xml

@@ -3,61 +3,77 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="ceilometer-agent-swift">
+  xml:id="ceilometer-swift">
-  <title>Configure the Object Storage service for Telemetry</title>
+  <title>Configure the Object Storage service</title>
+  <para>To retrieve storage-oriented events and samples, configure the
+    Object Storage service to send notifications to the message bus.</para>
   <procedure>
+    <title>To configure prerequisites</title>
+    <para>The Telemetry service requires access to the Object Storage
+      service using the <literal>ResellerAdmin</literal> role. Perform
+      these steps on the controller node.</para>
     <step>
-      <para>Install the <package>python-ceilometerclient</package>
+      <para>Source the <literal>admin</literal> credentials to gain
-        package on your Object Storage proxy server:</para>
+        access to admin-only CLI commands.</para>
-        <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install python-ceilometerclient</userinput></screen>
+       <screen><prompt>$</prompt> <userinput>source admin-openrc.sh</userinput></screen>
-        <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install python-ceilometerclient</userinput></screen>
-        <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install python-ceilometerclient</userinput></screen>
     </step>
     <step>
-      <para>To retrieve object store statistics, the Telemetry service
+      <para>Create the <literal>ResellerAdmin</literal> role:</para>
-        needs access to Object Storage with the
-          <literal>ResellerAdmin</literal> role. Give this role to
-        your <literal>os_username</literal> user for the
-          <literal>os_tenant_name</literal> tenant:</para>
       <screen><prompt>$</prompt> <userinput>keystone role-create --name ResellerAdmin</userinput>
 <computeroutput>+----------+----------------------------------+
 | Property |              Value               |
 +----------+----------------------------------+
 |    id    | 462fa46c13fd4798a95a3bfbe27b5e54 |
 |   name   |          ResellerAdmin           |
-+----------+----------------------------------+
++----------+----------------------------------+</computeroutput></screen>
-</computeroutput></screen>
+    </step>
+    <step>
+      <para>Add the <literal>ResellerAdmin</literal> role to the
+        <literal>service</literal> tenant and <literal>ceilometer</literal>
+        user:</para>
       <screen><prompt>$</prompt> <userinput>keystone user-role-add --tenant service --user ceilometer \
-      --role <replaceable>462fa46c13fd4798a95a3bfbe27b5e54</replaceable></userinput></screen>
+  --role 462fa46c13fd4798a95a3bfbe27b5e54</userinput></screen>
+    </step>
+  </procedure>
+  <procedure>
+    <title>To configure notifications</title>
+    <para>Perform these steps on the controller and any other nodes that
+      run the Object Storage proxy service.</para>
+    <step>
+      <para>Edit the <filename>/etc/swift/proxy-server.conf</filename> file
+        and complete the following actions:</para>
+      <substeps>
+        <step>
+          <para>In the <literal>[filter:keystoneauth]</literal> section,
+            add the <literal>ResellerAdmin</literal> role:</para>
+          <programlisting language="ini">[filter:keystoneauth]
+...
+operator_roles = admin,_member_,ResellerAdmin</programlisting>
+        </step>
+        <step>
+          <para>In the <literal>[pipeline:main]</literal> section, add
+            <literal>ceilometer</literal>:</para>
+          <programlisting language="ini">[pipeline:main]
+...
+pipeline = authtoken cache healthcheck keystoneauth proxy-logging ceilometer proxy-server</programlisting>
+        </step>
+        <step>
+          <para>In the <literal>[filter:ceilometer]</literal> section, configure
+            notifications:</para>
+          <programlisting language="ini">[filter:ceilometer]
+use = egg:ceilometer#swift
+log_level = WARN</programlisting>
+        </step>
+      </substeps>
     </step>
     <step>
-      <para>You must also add the Telemetry middleware to Object
+      <para>Add the <literal>swift</literal> system user to the
-        Storage to handle incoming and outgoing traffic. Add
+        <literal>ceilometer</literal> system group to permit access to the
-        these lines to the
+        Telemetry configuration files by the Object Storage service:</para>
-          <filename>/etc/swift/proxy-server.conf</filename>
-        file:</para>
-      <programlisting language="ini">[filter:ceilometer]
-use = egg:ceilometer#swift</programlisting>
-    </step>
-    <step>
-      <para>Add <literal>ceilometer</literal> to the
-          <literal>pipeline</literal> parameter of that same file:</para>
-      <programlisting language="ini">[pipeline:main]
-pipeline = healthcheck cache authtoken keystoneauth ceilometer proxy-server</programlisting>
-    </step>
-    <step>
-      <para>Add the system user <literal>swift</literal> to the system group
-      <literal>ceilometer</literal> to give Object Storage access to the
-      <filename>ceilometer.conf</filename> file.</para>
       <screen><prompt>#</prompt> <userinput>usermod -a -G ceilometer swift</userinput></screen>
     </step>
     <step>
-      <para>Add <literal>ResellerAdmin</literal> to the
+      <para>Restart the Object Storage proxy service:</para>
-        <literal>operator_roles</literal> parameter of that same file:</para>
-      <programlisting language="ini">operator_roles = Member,admin,swiftoperator,_member_,ResellerAdmin</programlisting>
-    </step>
-    <step>
-      <para>Restart the service with its new settings:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service swift-proxy restart</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl restart openstack-swift-proxy.service</userinput></screen>
       <para os="sles">On SLES:</para>