From 31bd4202b34ae8ddf7a99e2f75fa25c0d8dedbd6 Mon Sep 17 00:00:00 2001 From: Matthew Kassawara Date: Tue, 27 Oct 2015 18:37:05 -0600 Subject: [PATCH] [install] Liberty updates for swift More swift configuration updates for Liberty including some changes for RDO packages. Also try to make long URLs render better and fix a few other minor issues. Change-Id: I5fc00726657ce9cb5130e3089d83470b564dd291 Implements: bp installguide-liberty --- .../source/swift-controller-include.txt | 2 + .../source/swift-controller-install.rst | 6 +-- .../source/swift-finalize-installation.rst | 10 +++-- .../source/swift-initial-rings.rst | 3 +- .../source/swift-storage-include1.txt | 1 + .../source/swift-storage-include2.txt | 1 + .../source/swift-storage-include3.txt | 1 + .../source/swift-storage-install.rst | 38 ++++++++++--------- 8 files changed, 35 insertions(+), 27 deletions(-) diff --git a/doc/install-guide/source/swift-controller-include.txt b/doc/install-guide/source/swift-controller-include.txt index d423f774d4..96a8d925f5 100644 --- a/doc/install-guide/source/swift-controller-include.txt +++ b/doc/install-guide/source/swift-controller-include.txt @@ -31,6 +31,7 @@ following actions: .. code-block:: console [app:proxy-server] + use = egg:swift#proxy ... account_autocreate = true @@ -73,5 +74,6 @@ following actions: .. code-block:: ini [filter:cache] + use = egg:swift#memcache ... memcache_servers = 127.0.0.1:11211 diff --git a/doc/install-guide/source/swift-controller-install.rst b/doc/install-guide/source/swift-controller-install.rst index 7ff93a992f..40e1460874 100644 --- a/doc/install-guide/source/swift-controller-install.rst +++ b/doc/install-guide/source/swift-controller-install.rst @@ -174,8 +174,7 @@ Install and configure components .. code-block:: console - # curl -o /etc/swift/proxy-server.conf \ - https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/liberty + # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/liberty .. only:: rdo @@ -184,8 +183,7 @@ Install and configure components .. code-block:: console - # curl -o /etc/swift/proxy-server.conf \ - https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/liberty + # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/liberty .. only:: obs diff --git a/doc/install-guide/source/swift-finalize-installation.rst b/doc/install-guide/source/swift-finalize-installation.rst index 65a8d3e33a..79ce67d383 100644 --- a/doc/install-guide/source/swift-finalize-installation.rst +++ b/doc/install-guide/source/swift-finalize-installation.rst @@ -133,10 +133,12 @@ Finalize installation openstack-swift-account-reaper.service openstack-swift-account-replicator.service # systemctl start openstack-swift-account.service openstack-swift-account-auditor.service \ openstack-swift-account-reaper.service openstack-swift-account-replicator.service - # systemctl enable openstack-swift-container.service openstack-swift-container-auditor.service \ - openstack-swift-container-replicator.service openstack-swift-container-updater.service - # systemctl start openstack-swift-container.service openstack-swift-container-auditor.service \ - openstack-swift-container-replicator.service openstack-swift-container-updater.service + # systemctl enable openstack-swift-container.service \ + openstack-swift-container-auditor.service openstack-swift-container-replicator.service \ + openstack-swift-container-updater.service + # systemctl start openstack-swift-container.service \ + openstack-swift-container-auditor.service openstack-swift-container-replicator.service \ + openstack-swift-container-updater.service # systemctl enable openstack-swift-object.service openstack-swift-object-auditor.service \ openstack-swift-object-replicator.service openstack-swift-object-updater.service # systemctl start openstack-swift-object.service openstack-swift-object-auditor.service \ diff --git a/doc/install-guide/source/swift-initial-rings.rst b/doc/install-guide/source/swift-initial-rings.rst index 6c6ef32faf..f1f48a5ce4 100644 --- a/doc/install-guide/source/swift-initial-rings.rst +++ b/doc/install-guide/source/swift-initial-rings.rst @@ -201,7 +201,8 @@ on local devices. .. code-block:: console - # swift-ring-builder object.builder add r1z1-10.0.0.51:6000/sdb 100 + # swift-ring-builder object.builder add \ + --region 1 --zone 1 --ip 10.0.0.51 --port 6000 --device sdb --weight 100 Repeat this command for each storage device on each storage node. In the example architecture, use the command in four variations: diff --git a/doc/install-guide/source/swift-storage-include1.txt b/doc/install-guide/source/swift-storage-include1.txt index b5db98cde1..a55d353bd2 100644 --- a/doc/install-guide/source/swift-storage-include1.txt +++ b/doc/install-guide/source/swift-storage-include1.txt @@ -36,5 +36,6 @@ following actions: .. code-block:: ini [filter:recon] + use = egg:swift#recon ... recon_cache_path = /var/cache/swift diff --git a/doc/install-guide/source/swift-storage-include2.txt b/doc/install-guide/source/swift-storage-include2.txt index fb99f2be23..af9bdf3e5d 100644 --- a/doc/install-guide/source/swift-storage-include2.txt +++ b/doc/install-guide/source/swift-storage-include2.txt @@ -36,5 +36,6 @@ following actions: .. code-block:: ini [filter:recon] + use = egg:swift#recon ... recon_cache_path = /var/cache/swift diff --git a/doc/install-guide/source/swift-storage-include3.txt b/doc/install-guide/source/swift-storage-include3.txt index 3861ceeebd..e1f19fe641 100644 --- a/doc/install-guide/source/swift-storage-include3.txt +++ b/doc/install-guide/source/swift-storage-include3.txt @@ -36,6 +36,7 @@ following actions: .. code-block:: ini [filter:recon] + use = egg:swift#recon ... recon_cache_path = /var/cache/swift recon_lock_path = /var/lock diff --git a/doc/install-guide/source/swift-storage-install.rst b/doc/install-guide/source/swift-storage-install.rst index 98336a020b..3694c22de7 100644 --- a/doc/install-guide/source/swift-storage-install.rst +++ b/doc/install-guide/source/swift-storage-install.rst @@ -112,14 +112,14 @@ storage nodes, you must prepare the storage devices. .. only:: ubuntu or debian - 5. Edit the ``/etc/default/rsync`` file and enable the ``rsync`` + 7. Edit the ``/etc/default/rsync`` file and enable the ``rsync`` service: .. code-block:: ini RSYNC_ENABLE=true - 6. Start the ``rsync`` service: + 8. Start the ``rsync`` service: .. code-block:: console @@ -127,7 +127,7 @@ storage nodes, you must prepare the storage devices. .. only:: obs or rdo - 5. Start the ``rsyncd`` service and configure it to start when the + 7. Start the ``rsyncd`` service and configure it to start when the system boots: .. code-block:: console @@ -168,31 +168,33 @@ Install and configure components .. only:: ubuntu or rdo or debian - 2. Obtain the accounting, container, object, container-reconciler, and - object-expirer service configuration files from the Object Storage - source repository: + 2. Obtain the accounting, container, and object service configuration + files from the Object Storage source repository: .. code-block:: console - # curl -o /etc/swift/account-server.conf \ - https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/liberty - # curl -o /etc/swift/container-server.conf \ - https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/liberty - # curl -o /etc/swift/object-server.conf \ - https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/liberty - # curl -o /etc/swift/container-reconciler.conf \ - https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/liberty - # curl -o /etc/swift/object-expirer.conf \ - https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/liberty + # curl -o /etc/swift/account-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/liberty + # curl -o /etc/swift/container-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/liberty + # curl -o /etc/swift/object-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/liberty 3. .. include:: swift-storage-include1.txt 4. .. include:: swift-storage-include2.txt 5. .. include:: swift-storage-include3.txt 6. Ensure proper ownership of the mount point directory structure: - .. code-block:: console + .. only:: ubuntu or debian or obs - # chown -R root:swift /srv/node + .. code-block:: console + + # chown -R root:swift /srv/node + + .. only:: rdo + + .. code-block:: console + + # chown -R swift:swift /srv/node + +.. only:: ubuntu 7. Create the ``recon`` directory and ensure proper ownership of it: