Browse Source

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

changes/74/567174/1
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
28ab0afaa5
  1. 6
      CONTRIBUTING.rst
  2. 4
      README.rst
  3. 6
      hot/autohealing/autohealing_group.yaml
  4. 7
      hot/autohealing/autohealing_server.yaml
  5. 3
      hot/neutron/instance_trunk_port.yaml
  6. 5
      openshift-origin/centos65/highly-available/README.md
  7. 2
      setup.cfg

6
CONTRIBUTING.rst

@ -1,16 +1,16 @@
If you would like to contribute to the development of OpenStack,
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
should be submitted for review via the Gerrit tool, following
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.
Bugs should be filed on Launchpad, not GitHub:
https://bugs.launchpad.net/heat-templates
https://bugs.launchpad.net/heat-templates

4
README.rst

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

6
hot/autohealing/autohealing_group.yaml

@ -6,9 +6,9 @@ description: >
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
enabled in Aodh, following the instructions at
http://docs.openstack.org/developer/aodh/event-alarm.html - specifically by
adding the publisher "notifier://?topic=alarm.all" in
/etc/ceilometer/event_pipeline.yaml.
https://docs.openstack.org/aodh/latest/contributor/event-alarm.html#configuration
(specifically by adding the publisher "notifier://?topic=alarm.all" in
/etc/ceilometer/event_pipeline.yaml).
parameters:
flavor:

7
hot/autohealing/autohealing_server.yaml

@ -10,9 +10,10 @@ description: >
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
that this requires event alarms to be enabled in Aodh, following the
instructions at http://docs.openstack.org/developer/aodh/event-alarm.html -
specifically, by adding the publisher "notifier://?topic=alarm.all" in
/etc/ceilometer/event_pipeline.yaml.
instructions at
https://docs.openstack.org/aodh/latest/contributor/event-alarm.html#configuration
(specifically, by adding the publisher "notifier://?topic=alarm.all" in
/etc/ceilometer/event_pipeline.yaml).
parameters:
flavor:

3
hot/neutron/instance_trunk_port.yaml

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

5
openshift-origin/centos65/highly-available/README.md

@ -40,11 +40,12 @@ This nested heat stack deploys a highly-available OpenShift Origin environment.
* Neutron networking: one private and one public network
* Compute quota for six VM instances
* 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
## 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
* oso_ha_stack.yaml

2
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/heat/
home-page = https://docs.openstack.org/heat/latest/
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology

Loading…
Cancel
Save