From 6adcdfc23251fba285ec33fb04685756ed7c642e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 27 Mar 2014 10:28:00 +0100 Subject: [PATCH] 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 | 24 +++++--------- ...ject-storage-install-config-proxy-node.xml | 14 +++----- ...t-storage-install-config-storage-nodes.xml | 32 ++----------------- .../section_keystone-install.xml | 6 +--- 4 files changed, 16 insertions(+), 60 deletions(-) diff --git a/doc/install-guide/app_reserved_uids.xml b/doc/install-guide/app_reserved_uids.xml index 2ddc98f0b7..09ec39f03c 100644 --- a/doc/install-guide/app_reserved_uids.xml +++ b/doc/install-guide/app_reserved_uids.xml @@ -32,58 +32,50 @@ - ceilometer - openstack-ceilometer + ceilometer OpenStack Ceilometer Daemons 166 Assigned during package installation - cinder - openstack-cinder + cinder OpenStack Cinder Daemons 165 Assigned during package installation - glance - openstack-glance + glance OpenStack Glance Daemons 161 Assigned during package installation - heat - openstack-heat + heat OpenStack Heat Daemons 187 Assigned during package installation - keystone - openstack-keystone + keystone OpenStack Keystone Daemons 163 Assigned during package installation - neutron - openstack-neutron + neutron OpenStack Neutron Daemons 164 Assigned during package installation - nova - openstack-nova + nova OpenStack Nova Daemons 162 96 Assigned during package installation - swift - openstack-swift + swift OpenStack Swift Daemons 160 Assigned during package installation 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 f9061cda53..923542b150 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 @@ -12,12 +12,8 @@ The Object Storage processes run under a separate user and group, set by configuration options, and referred to as - swift:swiftopenstack-swift:openstack-swift. The default - user is swiftopenstack-swift. + swift:swift. The default + user is swift. @@ -57,8 +53,7 @@ /etc/swift/proxy-server.conf: [DEFAULT] bind_port = 8080 -user = swiftuser = openstack-swift +user = swift [pipeline:main] pipeline = healthcheck cache authtoken keystoneauth proxy-server @@ -176,8 +171,7 @@ use = egg:swift#healthcheck Make sure the swift user owns all configuration files: - # chown -R swift:swift /etc/swift - # chown -R openstack-swift:openstack-swift /etc/swift + # chown -R swift:swift /etc/swift Restart the Proxy service: diff --git a/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml b/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml index 6a1ee23e12..40115897ef 100644 --- a/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml +++ b/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml @@ -40,15 +40,14 @@ # echo "/dev/sdb1 /srv/node/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0" >> /etc/fstab # mkdir -p /srv/node/sdb1 # mount /srv/node/sdb1 -# chown -R swift:swift /srv/node -# chown -R openstack-swift:openstack-swift /srv/node +# chown -R swift:swift /srv/node Create /etc/rsyncd.conf: Replace the content of /etc/rsyncd.conf with: - uid = swift + 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 - uid = openstack-swift -gid = openstack-swift -log file = /var/log/rsyncd.log -pid file = /var/run/rsyncd.pid -address = STORAGE_LOCAL_NET_IP - -[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 Create the swift recon cache directory and set its permissions: - # mkdir -p /var/swift/recon + # mkdir -p /var/swift/recon # chown -R swift:swift /var/swift/recon - # mkdir -p /var/swift/recon -# chown -R openstack-swift:openstack-swift /var/swift/recon diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml index fabc4aa58b..e479240d28 100644 --- a/doc/install-guide/section_keystone-install.xml +++ b/doc/install-guide/section_keystone-install.xml @@ -189,12 +189,8 @@ admin_token = ADMIN_TOKEN By default, Keystone uses PKI tokens. Create the signing keys and certificates: - # keystone-manage pki_setup --keystone-user keystone --keystone-group keystone + # keystone-manage pki_setup --keystone-user keystone --keystone-group keystone # chown -R keystone:keystone /etc/keystone/* /var/log/keystone/keystone.log - # keystone-manage pki_setup --keystone-user openstack-keystone \ - --keystone-group openstack-keystone -# chown -R openstack-keystone:openstack-keystone /etc/keystone/* \ - /var/log/keystone/keystone.log