From fa0077707e15abfbecddbd22fe8594ffe3b4ecc4 Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Sat, 22 Jul 2017 08:59:43 +0900 Subject: [PATCH] Update URLs Some URLs are broken, so fix them. The others are redirect to new URLs, so replace them with new ones. The config options of nova serial console proxy have been gathered in nova/conf/serial_console.py. So the description in doc/source/guides/nova.rst is fixed. Change-Id: Ifd81cc09969341fbf8f135a913fc6003b94e0acc --- README.rst | 4 ++-- doc/source/guides/nova.rst | 10 ++++------ inc/python | 8 ++++---- samples/local.conf | 2 +- setup.cfg | 2 +- stack.sh | 2 +- tools/fixup_stuff.sh | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/README.rst b/README.rst index b4240bdc91..adbf59a637 100644 --- a/README.rst +++ b/README.rst @@ -14,7 +14,7 @@ Goals * To provide an environment for the OpenStack CI testing on every commit to the projects -Read more at http://docs.openstack.org/developer/devstack +Read more at https://docs.openstack.org/devstack/latest IMPORTANT: Be sure to carefully read `stack.sh` and any other scripts you execute before you run them, as they install software and will alter your @@ -92,5 +92,5 @@ DevStack can be extensively configured via the configuration file `local.conf`. It is likely that you will need to provide and modify this file if you want anything other than the most basic setup. Start by reading the `configuration guide -`_ +`_ for details of the configuration file and the many available options. diff --git a/doc/source/guides/nova.rst b/doc/source/guides/nova.rst index a91e0d194c..6bbab53aea 100644 --- a/doc/source/guides/nova.rst +++ b/doc/source/guides/nova.rst @@ -13,7 +13,7 @@ In Juno, nova implemented a `spec `_ to allow read/write access to the serial console of an instance via `nova-serialproxy -`_. +`_. The service can be enabled by adding ``n-sproxy`` to ``ENABLED_SERVICES``. Further options can be enabled via @@ -62,11 +62,9 @@ The service can be enabled by adding ``n-sproxy`` to Enabling the service is enough to be functional for a single machine DevStack. -These config options are defined in `nova.console.serial -`_ -and `nova.cmd.serialproxy -`_. +These config options are defined in `nova.conf.serial_console +`_. For more information on OpenStack configuration see the `OpenStack Configuration Reference -`_ +`_ diff --git a/inc/python b/inc/python index 718cbb23b1..f388f48e91 100644 --- a/inc/python +++ b/inc/python @@ -441,7 +441,7 @@ function setup_dev_lib { # project_dir: directory of project repo (e.g., /opt/stack/keystone) # extras: comma-separated list of optional dependencies to install # (e.g., ldap,memcache). -# See http://docs.openstack.org/developer/pbr/#extra-requirements +# See https://docs.openstack.org/pbr/latest/user/using.html#extra-requirements # The command is like "pip install []" function setup_install { local project_dir=$1 @@ -455,7 +455,7 @@ function setup_install { # project_dir: directory of project repo (e.g., /opt/stack/keystone) # extras: comma-separated list of optional dependencies to install # (e.g., ldap,memcache). -# See http://docs.openstack.org/developer/pbr/#extra-requirements +# See https://docs.openstack.org/pbr/latest/user/using.html#extra-requirements # The command is like "pip install -e []" function setup_develop { local project_dir=$1 @@ -487,7 +487,7 @@ function is_in_projects_txt { # flags: pip CLI options/flags # extras: comma-separated list of optional dependencies to install # (e.g., ldap,memcache). -# See http://docs.openstack.org/developer/pbr/#extra-requirements +# See https://docs.openstack.org/pbr/latest/user/using.html#extra-requirements # The command is like "pip install []" function _setup_package_with_constraints_edit { local project_dir=$1 @@ -523,7 +523,7 @@ function _setup_package_with_constraints_edit { # flags: pip CLI options/flags # extras: comma-separated list of optional dependencies to install # (e.g., ldap,memcache). -# See http://docs.openstack.org/developer/pbr/#extra-requirements +# See https://docs.openstack.org/pbr/latest/user/using.html#extra-requirements # The command is like "pip install []" function setup_package { local project_dir=$1 diff --git a/samples/local.conf b/samples/local.conf index 6d5351f904..8b76137c38 100644 --- a/samples/local.conf +++ b/samples/local.conf @@ -10,7 +10,7 @@ # This is a collection of some of the settings we have found to be useful # in our DevStack development environments. Additional settings are described -# in http://docs.openstack.org/developer/devstack/configuration.html#local-conf +# in https://docs.openstack.org/devstack/latest/configuration.html#local-conf # These should be considered as samples and are unsupported DevStack code. # The ``localrc`` section replaces the old ``localrc`` configuration file. diff --git a/setup.cfg b/setup.cfg index 73d22b5268..fcd2b13f41 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.rst author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = http://docs.openstack.org/developer/devstack +home-page = https://docs.openstack.org/devstack/latest classifier = Intended Audience :: Developers License :: OSI Approved :: Apache Software License diff --git a/stack.sh b/stack.sh index b786f7bd83..018ed3e3cc 100755 --- a/stack.sh +++ b/stack.sh @@ -1534,7 +1534,7 @@ if [[ "$USE_SYSTEMD" == "True" ]]; then echo echo "Services are running under systemd unit files." echo "For more information see: " - echo "https://docs.openstack.org/developer/devstack/systemd.html" + echo "https://docs.openstack.org/devstack/latest/systemd.html" echo fi diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 0b78bdeb00..55cd7252ea 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -157,7 +157,7 @@ if is_fedora; then # [1] https://bugzilla.redhat.com/show_bug.cgi?id=1099031 # [2] https://bugs.launchpad.net/neutron/+bug/1455303 # [3] https://github.com/redhat-openstack/openstack-puppet-modules/blob/master/firewall/manifests/linux/redhat.pp - # [4] http://docs.openstack.org/developer/devstack/guides/neutron.html + # [4] https://docs.openstack.org/devstack/latest/guides/neutron.html if is_package_installed firewalld; then sudo systemctl disable firewalld # The iptables service files are no longer included by default,