From d29fba92ba1ad087621e56b4171165c7952b1626 Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <zhiqiang.fan@huawei.com>
Date: Tue, 18 Mar 2014 11:15:37 +0800
Subject: [PATCH] Correct swift proxy service name

Swift proxy service is named swift-proxy on ubuntu distribution, and
openstack-swift-proxy on suse and redhat. But there are some places
use incorrect name for service operations, they should be fixed.

Change-Id: I784e2c290833592cda7e1a2de737787fd739baee
Closes-Bug: #1293901
Closes-Bug: #1293907
backport: havana
---
 .../section_object-storage-install-config-proxy-node.xml      | 2 +-
 doc/install-guide/section_ceilometer-swift.xml                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml b/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml
index 4350b0e011..f9061cda53 100644
--- a/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml
+++ b/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml
@@ -181,7 +181,7 @@ use = egg:swift#healthcheck
         </step>
         <step os="ubuntu;debian">
             <para>Restart the Proxy service:</para>
-            <screen><prompt>#</prompt> <userinput>service proxy-server restart</userinput></screen>
+            <screen><prompt>#</prompt> <userinput>service swift-proxy restart</userinput></screen>
         </step>
         <step os="rhel;centos;fedora;sles;opensuse">
             <para>Start the Proxy service and configure it to start when the
diff --git a/doc/install-guide/section_ceilometer-swift.xml b/doc/install-guide/section_ceilometer-swift.xml
index 0d378d4834..1584e4d707 100644
--- a/doc/install-guide/section_ceilometer-swift.xml
+++ b/doc/install-guide/section_ceilometer-swift.xml
@@ -39,8 +39,8 @@ pipeline = healthcheck cache authtoken keystoneauth ceilometer proxy-server</pro
     </step>
     <step>
       <para>Restart the service with its new settings:</para>
-      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service swift-proxy-server restart</userinput></screen>
-      <screen os="rhel;fedora;centos;sles;opensuse"><prompt>#</prompt> <userinput>service openstack-swift-proxy-server restart</userinput></screen>
+      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service swift-proxy restart</userinput></screen>
+      <screen os="rhel;fedora;centos;sles;opensuse"><prompt>#</prompt> <userinput>service openstack-swift-proxy restart</userinput></screen>
     </step>
   </procedure>
 </section>