Merge "Update and replace http with https for doc links in heat-templates"

This commit is contained in:
Zuul 2018-03-27 15:51:04 +00:00 committed by Gerrit Code Review
commit 28ab0afaa5
7 changed files with 17 additions and 16 deletions

View File

@ -1,16 +1,16 @@
If you would like to contribute to the development of OpenStack, If you would like to contribute to the development of OpenStack,
you must follow the steps in this page: you must follow the steps in this page:
http://docs.openstack.org/infra/manual/developers.html https://docs.openstack.org/infra/manual/developers.html
Once those steps have been completed, changes to OpenStack Once those steps have been completed, changes to OpenStack
should be submitted for review via the Gerrit tool, following should be submitted for review via the Gerrit tool, following
the workflow documented at: the workflow documented at:
http://docs.openstack.org/infra/manual/developers.html#development-workflow https://docs.openstack.org/infra/manual/developers.html#development-workflow
Pull requests submitted through GitHub will be ignored. Pull requests submitted through GitHub will be ignored.
Bugs should be filed on Launchpad, not GitHub: Bugs should be filed on Launchpad, not GitHub:
https://bugs.launchpad.net/heat-templates https://bugs.launchpad.net/heat-templates

View File

@ -2,8 +2,8 @@
Team and repository tags Team and repository tags
======================== ========================
.. image:: http://governance.openstack.org/badges/heat-templates.svg .. image:: https://governance.openstack.org/tc/badges/heat-templates.svg
:target: http://governance.openstack.org/reference/tags/index.html :target: https://governance.openstack.org/tc/reference/tags/index.html
.. Change things from this point on .. Change things from this point on

View File

@ -6,9 +6,9 @@ description: >
Aodh alarm delivered to a Zaqar queue that triggers a Mistral workflow to Aodh alarm delivered to a Zaqar queue that triggers a Mistral workflow to
replace the stopped server. Note that this requires event alarms to be replace the stopped server. Note that this requires event alarms to be
enabled in Aodh, following the instructions at enabled in Aodh, following the instructions at
http://docs.openstack.org/developer/aodh/event-alarm.html - specifically by https://docs.openstack.org/aodh/latest/contributor/event-alarm.html#configuration
adding the publisher "notifier://?topic=alarm.all" in (specifically by adding the publisher "notifier://?topic=alarm.all" in
/etc/ceilometer/event_pipeline.yaml. /etc/ceilometer/event_pipeline.yaml).
parameters: parameters:
flavor: flavor:

View File

@ -10,9 +10,10 @@ description: >
server as failed. This should be the root-level stack, to ensure that any server as failed. This should be the root-level stack, to ensure that any
other resources depending on outputs from this stack are also updated. Note other resources depending on outputs from this stack are also updated. Note
that this requires event alarms to be enabled in Aodh, following the that this requires event alarms to be enabled in Aodh, following the
instructions at http://docs.openstack.org/developer/aodh/event-alarm.html - instructions at
specifically, by adding the publisher "notifier://?topic=alarm.all" in https://docs.openstack.org/aodh/latest/contributor/event-alarm.html#configuration
/etc/ceilometer/event_pipeline.yaml. (specifically, by adding the publisher "notifier://?topic=alarm.all" in
/etc/ceilometer/event_pipeline.yaml).
parameters: parameters:
flavor: flavor:

View File

@ -94,8 +94,7 @@ resources:
# a conflict error if the [parent] port status is not compatible # a conflict error if the [parent] port status is not compatible
# with the [trunk create] request." # with the [trunk create] request."
# #
# http://specs.openstack.org/openstack/neutron-specs # https://specs.openstack.org/openstack/neutron-specs/specs/newton/vlan-aware-vms.html
# /specs/newton/vlan-aware-vms.html
# #
# In practice this means that the Open vSwitch plugin(s) of Neutron # In practice this means that the Open vSwitch plugin(s) of Neutron
# will reject trunk creation when the parent port was already used # will reject trunk creation when the parent port was already used

View File

@ -40,11 +40,12 @@ This nested heat stack deploys a highly-available OpenShift Origin environment.
* Neutron networking: one private and one public network * Neutron networking: one private and one public network
* Compute quota for six VM instances * Compute quota for six VM instances
* Pool of seven available floating IP addresses. Addresses will be created and assigned at deployment. * Pool of seven available floating IP addresses. Addresses will be created and assigned at deployment.
* Load Balancer as a Server (LBaaS) configured. See neutron [lbaas agent configuration section](http://openstack.redhat.com/LBaaS). * Load Balancer as a Server (LBaaS) configured. See neutron [lbaas agent configuration section](https://www.rdoproject.org/networking/lbaas/).
* IP address of upstream (IT) DNS server for zone transfers * IP address of upstream (IT) DNS server for zone transfers
## Files ## Files
These templates are [Heat Orchestration Templates (HOT)](http://docs.openstack.org/developer/heat/template_guide/environment.html). Environment files are used to reduce CLI parameters and provide a way to reuse resources. These templates are [Heat Orchestration Templates (HOT)](https://docs.openstack.org/heat/latest/template_guide/hot_guide.html).
[Environment files](https://docs.openstack.org/heat/latest/template_guide/environment.html) are used to reduce CLI parameters and provide a way to reuse resources.
* Templates * Templates
* oso_ha_stack.yaml * oso_ha_stack.yaml

View File

@ -5,7 +5,7 @@ description-file =
README.rst README.rst
author = OpenStack author = OpenStack
author-email = openstack-dev@lists.openstack.org author-email = openstack-dev@lists.openstack.org
home-page = http://docs.openstack.org/developer/heat/ home-page = https://docs.openstack.org/heat/latest/
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology