From 86f435a2a56ddc13c361490a45309f11813a27ad Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Fri, 14 Jul 2017 08:54:27 +0800 Subject: [PATCH] Update URLs in documents according to document migration Change-Id: I1b8e63b37be6599a4263afdf12d8f617163fde20 --- README.md | 10 +++++----- ext/swift.rb | 2 +- ext/swift_keystone_test.rb | 2 +- files/swift_tester.rb | 2 +- manifests/dispersion.pp | 2 +- manifests/proxy/crossdomain.pp | 2 +- manifests/storage/disk.pp | 2 +- manifests/storage/ext4.pp | 2 +- manifests/storage/loopback.pp | 2 +- manifests/storage/server.pp | 2 +- setup.cfg | 2 +- templates/swift_keystone_test.erb | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 12ee4095..223214ee 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ The shared salt used when hashing ring mappings. ### Define: swift::storage::policy A defined type that is used to configure swift storage policies as defined by swift: -http://docs.openstack.org/developer/swift/overview_policies.html +https://docs.openstack.org/swift/latest/overview_policies.html It is important for the operator to have a solid understanding of storage policies so they understand which parts of this module are needed for the result they seek. swift::storage::policy is a wrapper to a new swift type/provider called "swift_storage_policy". @@ -138,7 +138,7 @@ default = false The swift_storage_policy provider will manage one or more storage policy sections that can be created in swift.conf. This provider will also enforce the following rules for swift storage policies as defined by the swift project: -http://docs.openstack.org/developer/swift/overview_policies.html#configuring-policies +https://docs.openstack.org/swift/latest/overview_policies.html#configuring-policies - No duplicate names or aliases used across all policies. - There is at least one policy that is marked as the default policy. - Policy name/alias case/content. @@ -266,7 +266,7 @@ The port for which the proxy service will bind to when it starts. ### Class swift::proxy::dlo -Configures [DLO middleware](http://docs.openstack.org/developer/swift/middleware.html#module-swift.common.middleware.dlo) for swift proxy. +Configures [DLO middleware](https://docs.openstack.org/swift/latest/middleware.html#module-swift.common.middleware.dlo) for swift proxy. ```puppet class { '::swift::proxy::dlo': @@ -416,7 +416,7 @@ It is assumed that the object expirer service will be installed on a proxy node. The 'swiftinit' provider is a custom provider of the service type. "Swift services are generally managed with swift-init. the general usage is swift-init , where service is the swift service to manage (for example object, container, account, proxy)" -From http://docs.openstack.org/developer/swift/admin_guide.html#managing-services +From https://docs.openstack.org/swift/latest/admin_guide.html#managing-services This new provider is intended to improve puppet-swift deployments in the following ways: @@ -592,7 +592,7 @@ Development Developer documentation for the entire puppet-openstack project. -* http://docs.openstack.org/developer/puppet-openstack-guide/ +* https://docs.openstack.org/puppet-openstack-guide/latest/ Contributors ------------ diff --git a/ext/swift.rb b/ext/swift.rb index 86dad46a..8832d445 100644 --- a/ext/swift.rb +++ b/ext/swift.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # # This is a script that uses -# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html +# instructions here: https://docs.openstack.org/swift/latest/howto_installmultinode.html # Even though I expect this script will work with a wide range # of swift versions, it is currently only tested with: 1.4.6 require 'open3' diff --git a/ext/swift_keystone_test.rb b/ext/swift_keystone_test.rb index 9e6284bb..72e55259 100644 --- a/ext/swift_keystone_test.rb +++ b/ext/swift_keystone_test.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # # This is a script that uses -# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html +# instructions here: https://docs.openstack.org/swift/latest/howto_installmultinode.html # Even though I expect this script will work with a wide range # of swift versions, it is currently only tested with: 1.4.6 require 'open3' diff --git a/files/swift_tester.rb b/files/swift_tester.rb index 5981c8af..f7fa0bd3 100644 --- a/files/swift_tester.rb +++ b/files/swift_tester.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # # This is a script that uses -# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html +# instructions here: https://docs.openstack.org/swift/latest/howto_installmultinode.html # Even though I expect this script will work with a wide range # of swift versions, it is currently only tested with: 1.4.6 require 'open3' diff --git a/manifests/dispersion.pp b/manifests/dispersion.pp index 97a72a89..a740360b 100644 --- a/manifests/dispersion.pp +++ b/manifests/dispersion.pp @@ -7,7 +7,7 @@ # on the swift proxy node. # # For more details, see : -# http://docs.openstack.org/developer/swift/admin_guide.html#cluster-health +# https://docs.openstack.org/swift/latest/admin_guide.html#cluster-health # # === Parameters # diff --git a/manifests/proxy/crossdomain.pp b/manifests/proxy/crossdomain.pp index 3b43353e..081aa88f 100644 --- a/manifests/proxy/crossdomain.pp +++ b/manifests/proxy/crossdomain.pp @@ -8,7 +8,7 @@ # == Parameters # # [*cross_domain_policy*] -# cross_domain_policy value according to http://docs.openstack.org/developer/swift/crossdomain.html +# cross_domain_policy value according to https://docs.openstack.org/swift/latest/crossdomain.html # default: # class swift::proxy::crossdomain ( diff --git a/manifests/storage/disk.pp b/manifests/storage/disk.pp index 6fc64d48..0f7471f8 100644 --- a/manifests/storage/disk.pp +++ b/manifests/storage/disk.pp @@ -1,6 +1,6 @@ # This Puppet resource is based on the following # instructions for creating a disk device: -# http://docs.openstack.org/developer/swift/development_saio.html +# https://docs.openstack.org/swift/latest/development_saio.html # # ==Add a raw disk to a swift storage node== # diff --git a/manifests/storage/ext4.pp b/manifests/storage/ext4.pp index 53f0d6b2..e9317508 100644 --- a/manifests/storage/ext4.pp +++ b/manifests/storage/ext4.pp @@ -1,5 +1,5 @@ # follow the instructions for creating a loopback device -# for storage from: http://docs.openstack.org/developer/swift/development_saio.html +# for storage from: https://docs.openstack.org/swift/latest/development_saio.html # # this define needs to be sent a refresh signal to do anything # diff --git a/manifests/storage/loopback.pp b/manifests/storage/loopback.pp index a0d81f20..7205e6dc 100644 --- a/manifests/storage/loopback.pp +++ b/manifests/storage/loopback.pp @@ -1,5 +1,5 @@ # follow the instructions for creating a loopback device -# for storage from: http://docs.openstack.org/developer/swift/development_saio.html +# for storage from: https://docs.openstack.org/swift/latest/development_saio.html # # # creates a managed loopback interface diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp index c032b03d..076185a2 100644 --- a/manifests/storage/server.pp +++ b/manifests/storage/server.pp @@ -57,7 +57,7 @@ # it will try to default to the number of effective cpu cores and fallback to # one. Increasing the number of workers may reduce the possibility of slow file # system operations in one request from negatively impacting other requests. -# See http://docs.openstack.org/developer/swift/deployment_guide.html#general-service-tuning +# See https://docs.openstack.org/swift/latest/deployment_guide.html#general-service-tuning # Defaults to $::os_workers. # # [*allow_versions*] diff --git a/setup.cfg b/setup.cfg index b718c30d..46cf0826 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.md author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = http://docs.openstack.org/developer/puppet-openstack-guide +home-page = https://docs.openstack.org/puppet-openstack-guide/latest classifier = Intended Audience :: Developers Intended Audience :: System Administrators diff --git a/templates/swift_keystone_test.erb b/templates/swift_keystone_test.erb index 336eee08..5194c102 100644 --- a/templates/swift_keystone_test.erb +++ b/templates/swift_keystone_test.erb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # # This is a script that uses -# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html +# instructions here: https://docs.openstack.org/swift/latest/howto_installmultinode.html # Even though I expect this script will work with a wide range # of swift versions, it is currently only tested with: 1.4.6 require 'open3'