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
This commit is contained in:
Andreas Jaeger
2014-03-27 10:28:00 +01:00
parent 0c1ecb5066
commit 6adcdfc232
4 changed files with 16 additions and 60 deletions

View File

@@ -32,58 +32,50 @@
<tbody>
<!-- sorted by first column -->
<tr>
<td os="ubuntu;debian;rhel;centos;fedora">ceilometer</td>
<td os="opensuse;sles">openstack-ceilometer</td>
<td>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 os="opensuse;sles">openstack-cinder</td>
<td>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 os="opensuse;sles">openstack-glance</td>
<td>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 os="opensuse;sles">openstack-heat</td>
<td>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 os="opensuse;sles">openstack-keystone</td>
<td>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 os="opensuse;sles">openstack-neutron</td>
<td>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 os="opensuse;sles">openstack-nova</td>
<td>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 os="opensuse;sles">openstack-swift</td>
<td>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>

View File

@@ -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"
>swift:swift</phrase><phrase os="opensuse;sles"
>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>
<literal>swift:swift</literal>. The default
user is <literal>swift</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
os="opensuse;sles">user = openstack-swift</phrase>
user = swift
[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 os="opensuse;sles"><prompt>#</prompt> <userinput>chown -R openstack-swift:openstack-swift /etc/swift</userinput></screen>
<screen><prompt>#</prompt> <userinput>chown -R swift:swift /etc/swift</userinput></screen>
</step>
<step os="ubuntu;debian">
<para>Restart the Proxy service:</para>

View File

@@ -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>
<phrase os="opensuse;sles"><prompt>#</prompt> <userinput>chown -R openstack-swift:openstack-swift /srv/node</userinput></phrase></screen>
<prompt>#</prompt> <userinput>chown -R swift:swift /srv/node</userinput></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>

View File

@@ -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">