Update user names for SUSE

The Icehouse packages for openSUSE and SLES now use the same
user names as everybody else. Update all places.

Change-Id: I25cde4ffa79bc7ebe56b8120dc36c2bbb42c6561

doc/install-guide/app_reserved_uids.xml

@@ -32,58 +32,50 @@
     <tbody>
       <!-- sorted by first column -->
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">ceilometer</td>
+        <td>ceilometer</td>
-        <td os="opensuse;sles">openstack-ceilometer</td>
         <td>OpenStack Ceilometer Daemons</td>
         <td os="rhel;centos;fedora">166</td>
         <td os="debian;opensuse;sles;ubuntu">Assigned during package installation</td>
       </tr>
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">cinder</td>
+        <td>cinder</td>
-        <td os="opensuse;sles">openstack-cinder</td>
         <td>OpenStack Cinder Daemons</td>
         <td os="rhel;centos;fedora">165</td>
         <td os="debian;opensuse;sles;ubuntu">Assigned during package installation</td>
       </tr>
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">glance</td>
+        <td>glance</td>
-        <td os="opensuse;sles">openstack-glance</td>
         <td>OpenStack Glance Daemons</td>
         <td os="rhel;centos;fedora">161</td>
         <td os="debian;opensuse;sles;ubuntu">Assigned during package installation</td>
       </tr>
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">heat</td>
+        <td>heat</td>
-        <td os="opensuse;sles">openstack-heat</td>
         <td>OpenStack Heat Daemons</td>
         <td os="rhel;centos;fedora">187</td>
         <td os="debian;opensuse;sles;ubuntu">Assigned during package installation</td>
       </tr>
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">keystone</td>
+        <td>keystone</td>
-        <td os="opensuse;sles">openstack-keystone</td>
         <td>OpenStack Keystone Daemons</td>
         <td os="rhel;centos;fedora">163</td>
         <td os="debian;opensuse;sles;ubuntu">Assigned during package installation</td>
       </tr>
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">neutron</td>
+        <td>neutron</td>
-        <td os="opensuse;sles">openstack-neutron</td>
         <td>OpenStack Neutron Daemons</td>
         <td os="rhel;centos;fedora">164</td>
         <td os="debian;opensuse;sles;ubuntu">Assigned during package installation</td>
       </tr>
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">nova</td>
+        <td>nova</td>
-        <td os="opensuse;sles">openstack-nova</td>
         <td>OpenStack Nova Daemons</td>
         <td os="rhel;centos;fedora">162</td>
         <td os="opensuse;sles">96</td>
         <td os="debian;ubuntu">Assigned during package installation</td>
       </tr>
       <tr>
-        <td os="ubuntu;debian;rhel;centos;fedora">swift</td>
+        <td>swift</td>
-        <td os="opensuse;sles">openstack-swift</td>
         <td>OpenStack Swift Daemons</td>
         <td os="rhel;centos;fedora">160</td>
         <td os="debian;opensuse;sles;ubuntu">Assigned during package installation</td>

doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml

@@ -12,12 +12,8 @@
     <note>
         <para>The Object Storage processes run under a separate user
             and group, set by configuration options, and referred to as
-            <literal> <phrase os="ubuntu;debian;rhel;centos;fedora"
+            <literal>swift:swift</literal>. The default
-            >swift:swift</phrase><phrase os="opensuse;sles"
+            user is <literal>swift</literal>.</para>
-            >openstack-swift:openstack-swift</phrase></literal>. The default
-            user is <literal><phrase os="ubuntu;debian;rhel;centos;fedora"
-            >swift</phrase><phrase os="opensuse;sles"
-            >openstack-swift</phrase></literal>.</para>
     </note>
     <procedure>
         <step>
@@ -57,8 +53,7 @@
                     <filename>/etc/swift/proxy-server.conf</filename>:</para>
             <programlisting language="ini">[DEFAULT]
 bind_port = 8080
-<phrase os="rhel;centos;fedora;ubuntu;debian">user = swift</phrase><phrase
+user = swift
-os="opensuse;sles">user = openstack-swift</phrase>
 
 [pipeline:main]
 pipeline = healthcheck cache authtoken keystoneauth proxy-server
@@ -176,8 +171,7 @@ use = egg:swift#healthcheck
         </step>
         <step>
             <para>Make sure the swift user owns all configuration files:</para>
-            <screen os="ubuntu;debian;rhel;centos;fedora"><prompt>#</prompt> <userinput>chown -R swift:swift /etc/swift</userinput></screen>
+            <screen><prompt>#</prompt> <userinput>chown -R swift:swift /etc/swift</userinput></screen>
-            <screen os="opensuse;sles"><prompt>#</prompt> <userinput>chown -R openstack-swift:openstack-swift /etc/swift</userinput></screen>
         </step>
         <step os="ubuntu;debian">
             <para>Restart the Proxy service:</para>

doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml

@@ -40,15 +40,14 @@
 <prompt>#</prompt> <userinput>echo "/dev/sdb1 /srv/node/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0" &gt;&gt; /etc/fstab</userinput>
 <prompt>#</prompt> <userinput>mkdir -p /srv/node/sdb1</userinput>
 <prompt>#</prompt> <userinput>mount /srv/node/sdb1</userinput>
-<phrase os="ubuntu;debian;rhel;centos;fedora"><prompt>#</prompt> <userinput>chown -R swift:swift /srv/node</userinput></phrase>
+<prompt>#</prompt> <userinput>chown -R swift:swift /srv/node</userinput></screen>
-<phrase os="opensuse;sles"><prompt>#</prompt> <userinput>chown -R openstack-swift:openstack-swift /srv/node</userinput></phrase></screen>
         </step>
         <step>
             <para os="ubuntu;debian;rhel;centos;fedora">Create
                 <filename>/etc/rsyncd.conf</filename>:</para>
             <para os="sles;opensuse">Replace the content of
                 <filename>/etc/rsyncd.conf</filename> with:</para>
-            <programlisting language="ini" os="ubuntu;debian;rhel;centos;fedora">uid = swift
+            <programlisting language="ini">uid = swift
 gid = swift
 log file = /var/log/rsyncd.log
 pid file = /var/run/rsyncd.pid
@@ -66,29 +65,6 @@ path = /srv/node/
 read only = false
 lock file = /var/lock/container.lock
 
-[object]
-max connections = 2
-path = /srv/node/
-read only = false
-lock file = /var/lock/object.lock</programlisting>
-            <programlisting language="ini" os="opensuse;sles">uid = openstack-swift
-gid = openstack-swift
-log file = /var/log/rsyncd.log
-pid file = /var/run/rsyncd.pid
-address = <replaceable>STORAGE_LOCAL_NET_IP</replaceable>
-
-[account]
-max connections = 2
-path = /srv/node/
-read only = false
-lock file = /var/lock/account.lock
-
-[container]
-max connections = 2
-path = /srv/node/
-read only = false
-lock file = /var/lock/container.lock
-
 [object]
 max connections = 2
 path = /srv/node/
@@ -133,10 +109,8 @@ lock file = /var/lock/object.lock</programlisting>
         <step>
             <para>Create the swift recon cache directory and set its
                 permissions:</para>
-            <screen os="ubuntu;debian;rhel;centos;fedora"><prompt>#</prompt> <userinput>mkdir -p /var/swift/recon</userinput>
+            <screen><prompt>#</prompt> <userinput>mkdir -p /var/swift/recon</userinput>
 <prompt>#</prompt> <userinput>chown -R swift:swift /var/swift/recon</userinput></screen>
-            <screen os="opensuse;sles"><prompt>#</prompt> <userinput>mkdir -p /var/swift/recon</userinput>
-<prompt>#</prompt> <userinput>chown -R openstack-swift:openstack-swift /var/swift/recon</userinput></screen>
         </step>
     </procedure>
 </section>

doc/install-guide/section_keystone-install.xml

@@ -189,12 +189,8 @@ admin_token = ADMIN_TOKEN
     <step os="rhel;centos;fedora;opensuse;sles">
       <para>By default, Keystone uses PKI tokens. Create the signing
         keys and certificates:</para>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>keystone-manage pki_setup --keystone-user keystone --keystone-group keystone</userinput>
+      <screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>keystone-manage pki_setup --keystone-user keystone --keystone-group keystone</userinput>
 <prompt>#</prompt> <userinput>chown -R keystone:keystone /etc/keystone/* /var/log/keystone/keystone.log</userinput></screen>
-      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>keystone-manage pki_setup --keystone-user openstack-keystone \
-   --keystone-group openstack-keystone</userinput>
-<prompt>#</prompt> <userinput>chown -R openstack-keystone:openstack-keystone /etc/keystone/* \
-   /var/log/keystone/keystone.log</userinput></screen>
     </step>
 
     <step os="ubuntu">