Commit Graph

151 Commits

Author SHA1 Message Date
Takashi Kajinami 6dbe7d7c8d Update git submodules
* Update heat-templates from branch 'master'
  to 109bb65c3adba0fa2b43d10ed5a78768a198e99d
  - Drop reference to dib-utils
    
    The dib-utils repository was retired when TripleO was retired. We
    decided to vendor the dib-run-parts script in os-refresh-config so
    we no longer need the separate tiny package for the dib-run-parts
    script.
    
    Depends-on: https://review.opendev.org/c/openstack/os-refresh-config/+/910574
    Change-Id: Id35efa4b387bd0fa21c1d73a4fe59f88c197f500
2024-03-01 09:05:28 +00:00
niuke fb3da13217 Update git submodules
* Update heat-templates from branch 'master'
  to 88f35e543d7d3a10e6fc2a1315c677d246acd49b
  - setup.cfg: Replace dashes with underscores
    
    Setuptools v54.1.0 introduces a warning that the use of dash-separated
    options in 'setup.cfg' will not be supported in a future version [1].
    Get ahead of the issue by replacing the dashes with underscores. Without
    this, we see 'UserWarning' messages like the following on new enough
    versions of setuptools:
    
      UserWarning: Usage of dash-separated 'description-file' will not be
      supported in future versions. Please use the underscore name
      'description_file' instead
    
    [1] https://github.com/pypa/setuptools/commit/a2e9ae4cb
    
    Change-Id: Ide8a235ab2ce27d16776f238b670800fde51be0b
2023-09-14 03:35:43 +00:00
Takashi Kajinami c899976308 Update git submodules
* Update heat-templates from branch 'master'
  to 75fa04a7cd9baea788d8db927b1abb7ebb6fe3ca
  - doc: Comment out language option
    
    ... because explicit language=None causes the below warning since
    Sphinx 5.0.0.
    
    Invalid configuration value found: 'language = None'. Update your
    configuration to a valid language code. Falling back to 'en' (English).
    
    Change-Id: Ieca6a2cb9724346ed4ee40a20335a02d737a3cd4
2022-08-16 06:21:34 +00:00
Zuul 10859d2a14 Update git submodules
* Update heat-templates from branch 'master'
  to 7d761bff3da8e74407c9e7572c163d28daeaa109
  - Merge "[ussuri][goal] Update contributor documentation"
  - [ussuri][goal] Update contributor documentation
    
    This patch updates/adds the contributor documentation to follow
    the guidelines of the Ussuri cycle community goal[1].
    
    [1] https://governance.openstack.org/tc/goals/selected/ussuri/project-ptl-and-contrib-docs.html
    
    Adding noop jobs also to merge these *.rst only changes.
    
    Story: #2007236
    Task: #38524
    Change-Id: Id40407adab666a9b7591612fe0ae237aa07c9175
2021-08-05 15:57:31 +00:00
Pavlo Shchelokovskyy b15a5ca40c Update git submodules
* Update heat-templates from branch 'master'
  to 7917e1877c1769088d14a9868c7078622642f7e1
  - Fix zuul config for heat-templates-check
    
    YAML indentation is wrong, instead of their appropriate sections
    options are set to the DEFAULT section of config like the following
    
      [DEFAULT]
      heat_api = {'workers': 2}
    
    not sure if oslo.config handles that properly so better fix this.
    
    Change-Id: Ie9ce52769504816734e72037aa08cb26c5276332
2021-06-07 17:49:21 +00:00
HeroicHitesh 4aff0cadf4 Update git submodules
* Update heat-templates from branch 'master'
  to 71a0f7a1a7843c31e5627c2feb2a9f9f58b75b87
  - Remove testr
    
    * Remove .testr.conf
    * Remove .tox(as there is no tox.ini) and .testrepository
      from .gitignore
    
    Signed-off-by: HeroicHitesh <email.hiteshkumar@gmail.com>
    Change-Id: Ic0620ecaa1ca021bdfe3a521bb0805c3276732f5
2021-06-01 03:22:32 +00:00
Zuul f9d32a7712 Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Fix software config on rdo"
  - Fix software config on rdo
    
    The os-refresh-config scripts directory is currently set to
    /opt/stack/os-config-refresh, but the latest os-refresh-config expects it to be
    /usr/libexec/os-refresh-config
    
    Change-Id: Ic3f61ea88fd431e7d9893c6930c778f6fbf21147
2020-11-16 06:46:30 +00:00
Zuul 7858b69703 Update git submodules
* Update heat-templates from branch 'master'
  - Merge "add template for servers using Octavia"
  - add template for servers using Octavia
    
    add examples for servers using Octavia loadbalancer,pool,listener,and healthMonitor
    
    Change-Id: I10052158456f4b8b4ad365799aa9bd99bca8cba0
2020-11-16 06:32:59 +00:00
Zuul 4b721ca759 Update git submodules
* Update heat-templates from branch 'master'
  - Merge "optimize size and time using --no-cache-dir"
  - optimize size and time using --no-cache-dir
    
    Using --no-cache-dir flag in pip install ,make sure dowloaded packages
    by pip don't cached on system . This is a best practise which make sure
    to fetch ftom repo instead of using local cached one . Further , in case
    of Docker Containers , by restricing caching , we can reduce image size.
    In term of stats , it depends upon the number of python packages
    multiplied by their respective size . e.g for heavy packages with a lot
    of dependencies it reduce a lot by don't caching pip packages.
    
    Further , more detail information can be found at
    
    https://medium.com/sciforce/strategies-of-docker-images-optimization-2ca9cc5719b6
    
    Change-Id: I99570e8da62205498bdba6064160d2592a86ad3e
    Signed-off-by: Pratik Raj <rajpratik71@gmail.com>
2020-11-16 06:15:42 +00:00
ricolin cdf15f4363 Update git submodules
* Update heat-templates from branch 'master'
  - Move heat-templates-check job to zuul v3
    
    Change-Id: Ie858c406b6a7d973f9632aa98360b7322758fc3a
2020-10-30 06:57:13 +00:00
Zuul aa322a0c2f Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Add sample templates for Blazar"
  - Add sample templates for Blazar
    
    Since Rocky, Heat supports Blazar which is a reservation service in
    OpenStack. This patch provides sample templates regarding Blazar Host
    and Lease resources accordingly.
    
    Change-Id: I169a96c63eee59ec9b0d098f86709e6d02d1209f
    Depends-On: I1392919540a6bdd67ce7078e3a1206ecdb9854e1
2020-02-21 07:28:52 +00:00
ricolin 44e9baf602 Update git submodules
* Update heat-templates from branch 'master'
  - Drop use of git.openstack.org
    
    Our cgit instance will be going away and opendev.org is the new
    preferred URL for browsing our git repos. Redirects will exist for the
    foreseeable future, but it's more efficient to just go directly to the
    new locations.
    
    Change-Id: I52a34bded5f4343469cbca647707304ca05c62ec
2019-12-23 05:34:20 +00:00
Hongbin Lu 36a22ec551 Update git submodules
* Update heat-templates from branch 'master'
  - Add example for running Zun container
    
    Change-Id: Ic08fa9c2918243296bd72bf05ca43dfade4b24f9
    
  - OpenDev Migration Patch
    
    This commit was bulk generated and pushed by the OpenDev sysadmins
    as a part of the Git hosting and code review systems migration
    detailed in these mailing list posts:
    
    http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
    http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html
    
    Attempts have been made to correct repository namespaces and
    hostnames based on simple pattern matching, but it's possible some
    were updated incorrectly or missed entirely. Please reach out to us
    via the contact information listed at https://opendev.org/ with any
    questions you may have.
2019-06-20 14:45:22 +00:00
Ian Wienand e40fd20a7b Update git submodules
* Update heat-templates from branch 'master'
  - Replace openstack.org git:// URLs with https://
    
    This is a mechanically generated change to replace openstack.org
    git:// URLs with https:// equivalents.
    
    This is in aid of a planned future move of the git hosting
    infrastructure to a self-hosted instance of gitea (https://gitea.io),
    which does not support the git wire protocol at this stage.
    
    This update should result in no functional change.
    
    For more information see the thread at
    
     http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html
    
    Change-Id: I28b9b536b3f22d6398c7e5be6bd205da73c07bd5
2019-04-02 15:07:44 +00:00
Zuul 57c16504f0 Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Add an example of OS::Mistral::ExternalResource"
  - Add an example of OS::Mistral::ExternalResource
    
    I couldn't find a simple example of that resource, so here's a real
    simplified one creating a workflow in the same template.
    
    Change-Id: I9de98df8a629227ba83e50382ccba660621fcbd5
2019-01-23 04:55:25 +00:00
Zuul 5fe7e2d322 Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Update the bugs link to storyboard"
  - Merge "Remove docs, deprecated hooks, tests"
  - Remove docs, deprecated hooks, tests
    
    Remove all deprecated hooks and tests.
    Also since all test and hooks are removed,
    we can remove the declare of python language in classifier.
    Since we didn't actually provide any document,
    we should remove docs too.
    
    Hooks are maintained as Agents under heat-agents repo now.
    Hooks in heat-templates are deprecated for a while. Hence, remove
    hooks in heat-templates.
    
    Depends-On: https://review.openstack.org/#/c/584774/
    Change-Id: Ia886f71eaf99d75db0f9a6a7dfbe8664995c26e7
    
  - Merge "Fix the incorrect cirros default password"
  - Update the bugs link to storyboard
    
    Change-Id: Ia56a41f346929d5abdf5296f5eef4571878d02b1
    
  - Use octavia resources for autoscaling example
    
    lbaasv2 is probably not actively maintained.
    
    Change-Id: Id11a47b5439f3bca05b536f15bec3e5fa92c9e56
    
  - Merge "Remove setting of DEVSTACK_GATE_EXERCISES"
  - Migrate the link of bug report button to storyboard
    
    Change-Id: I85439200113a719f2e1c7caea29ea8de57cb1a8a
    
  - Remove setting of DEVSTACK_GATE_EXERCISES
    
    This defaults to 0 anyway, and is being removed as the devstack
    excercises are being removed. see https://review.openstack.org/#/c/581377/
    
    Change-Id: I80b172b85fa29ae71cf3e14d63d654a5fea56c0c
    
  - Merge "Deprecate hooks in heat-templates"
  - Fix the incorrect cirros default password
    
    Following by https://docs.openstack.org/image-guide/obtain-images.html#cirros-test
    
    Change-Id: I43f8ab98ba18fb27209c6a80458053e0eea89216
    
  - Deprecate hooks in heat-templates
    
    We already create repository `heat-agents` for hooks and will keep
    maintain hooks there, so we should deprecate all hooks in
    heat-templates and plan to remove it in futuer.
    
    Change-Id: Ie2d89d5bab7db2bc6a2e171dc455098811519440
2019-01-03 22:45:47 +00:00
Zuul 43896e2ba4 Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Update and replace http with https for doc links in heat-templates"
  - Update and replace http with https for doc links in heat-templates
    
    1) Update doc links according to OpenStack document migration
    2) Use https instead of http for docs links
    
    Change-Id: Id87e91d1f95bcb94c31125c467abab17242cb36f
2018-03-27 15:51:04 +00:00
James E. Blair 59f2b396c0 Update git submodules
* Update heat-templates from branch 'master'
  - Zuul: Remove project name
    
    Zuul no longer requires the project-name for in-repo configuration.
    Omitting it makes forking or renaming projects easier.
    
    Change-Id: Ic1627186b152abbbd2b5c92bfa021af631397d38
2018-02-07 08:27:55 +00:00
Zuul 6fa609f527 Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Migrate templates job to Zuul v3"
  - Migrate templates job to Zuul v3
    
    Migrate templates job to zuul v3.
    Migrating guideline:
    https://docs.openstack.org/infra/manual/zuulv3.html
    
    Needed-By: I096b406389f610b503649ee8a4b5067d3f2dec5e
    Change-Id: I5bfa473e265fc1dea79adb98dfc06d7c7058f84c
2018-01-15 05:53:05 +00:00
Zuul 0d47601d5e Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Add example for using external resources"
  - Add example for using external resources
    
    Add template for show cases that how we can use external resources.
    external resources in stack does not required to be modified or depends
    on the stack.
    blueprint external-resources
    
    Depends-On: I8b33c957a7185a0f52356f412b13609ba1a7b469
    Change-Id: Ia56318508caf43a7da28bd479becdc602477cad5
2017-12-06 20:28:55 +00:00
Zuul a1614db5cc Update git submodules
* Update heat-templates from branch 'master'
  - Merge "Add create magnum cluster resources example"
  - Add create magnum cluster resources example
    
    Add a tempate to demostrates how to create magnum COE cluster.
    Partial-Bug: #1625757
    Depends-On: I714f6dbc3a612425128f18ef3cea0336fdc47090
    
    Change-Id: I76c0eff8eedcc1d345b21ea9c9689b52a21a6af7
2017-12-01 07:15:56 +00:00
Roberto Polli 7534325a49 Update git submodules
* Update heat-templates from branch 'master'
  - Replace LBaaS with LBaaSv2.
    
      Since Mitaka, OS::Neutron::LBaaS::LoadBalancer replaces
      OS::Neutron::LoadBalancer. The patch replaces both
      heat_template_version and OS::Neutron::LoadBalancer.
    
    Closes-Bug: #1722853
    Change-Id: I284c72b67bdaaadde35a97feb807171046e3a93f
2017-10-19 16:42:54 +00:00
Jenkins 0f1b73b646 Updated openstack/openstack
Project: openstack/heat-templates  1d2d3cb75f30d60f4e7468c64f49e9752e55719b

Add example for using condition

Add template for show cases that how we can use
condition for resource, property and output.

Change-Id: I34ba7db9827ad16a23f60f615fa1ae0dbdc38aa8
Blueprint: support-conditions-function
2017-09-06 04:50:57 +00:00
Jenkins d164d1ea09 Updated openstack/openstack
Project: openstack/heat-templates  1f731ed863d66cca5ece9c11cb99a9be518e5cbf

[Trivialfix]Fix typos

Fix typos in heat-templates.

Change-Id: I2be63f3f6cbe25149636abd385d8f6be39b5940a
2017-08-23 07:45:52 +00:00
Jenkins 6f8b666fc5 Updated openstack/openstack
Project: openstack/heat-templates  671de9b5372c006554358c2439009a7914469989

Make cirros-example v3 compatible

This example seems broken. Though it will work if you
change the auth_url to point to /v2.0 rather than /v3, it's
better to make it work with v3 (the default now for all
keystone deployments).

Change-Id: I411a0f50ae50ee5b7c2564a7764ee9a01b00afea
2017-08-23 07:45:21 +00:00
rabi a21323e5a1 Updated openstack/openstack
Project: openstack/heat-templates  a7243bc0896a24e0d403589b852ba51ecb4ff2a0

Use correct policy references in autoscaling.yaml

It seems I4a617daf063fb1faf01c71762d6509cb00eed0b6 has added some
wrong resource references. It seems it was not detected at that
time with the dsvm job and some recent heat code changes have made
it detect the issue.

Change-Id: I1ac6371929fd2dbbe16c8faa6617cad1e4367fdf
Closes-Bug: #1707874
2017-08-02 02:20:32 +00:00
rabi 6849252d8c Updated openstack/openstack
Project: openstack/heat-templates  cedf2769181954dfb6ec5ebfefdc1d105b8ec266

Add basic stuff to build docs

This adds basic stuff required to build docs.

Change-Id: Ib9b917cc442e73aa177c68b1e1b26792ed2e8cd2
2017-07-21 04:33:19 +00:00
Jenkins c36fccf2bd Updated openstack/openstack
Project: openstack/heat-templates  25c9f451991f1b7fe4fca32f1f5d8f919351ddcb

New template: Example for Neutron Trunks

Add an example serving as documentation. It is not meant to be used as
is, though it works.

Change-Id: I623f778d2678d15ad68d5729a78a4aa3bdd8031f
Depends-On: Iea12844f77abf8c254f6224d55470663eba66aab
Partially-Implements: blueprint support-trunk-port
2017-07-17 03:51:17 +00:00
Jenkins aeffad415e Updated openstack/openstack
Project: openstack/heat-templates  36a473a03fec3ae50453a3b0975956c0c3b55ae7

autoscaling: fix a type in gnocchi command

Change-Id: I85b15ebd2f294b82d16e63527d3b447a1267d6e3
2017-07-13 20:05:56 +00:00
ricolin d9a5b9768e Updated openstack/openstack
Project: openstack/heat-templates  e4df67e265fa023eed99d4609d45821196255851

Fix undefined basestring and unicode in py35

In py3 basestring and unicode are no longer valid,
and should use `str` instead. In order to cover
py2 and py3, we change to use six lib to cover both.
Closes-Bug: #1682015

Change-Id: I3159470965e3a20161ff0e997af625b45ebe21fa
2017-07-13 15:25:55 +00:00
Spyros Trigazis 4be0879bb4 Updated openstack/openstack
Project: openstack/heat-templates  1351cc322b5eee3ba5c1f6d4fd550a4d86251a0a

Fix heat-container-agent

* use fedora base image from fedora registry
* fix ADD and run script
* move package install in Dockerfile for layers
* add zaqarclient

Change-Id: Iaa82fcd7af25ec81e982e6b170aa1d449f6e1166
2017-07-03 10:12:08 +00:00
Jenkins 24a5560126 Updated openstack/openstack
Project: openstack/heat-templates  69c1326442b4cee033625a921faae62a78f0ddd5

autoscaling: don't query an no more existing API

This change replaces Ceilometer API query to
the corresponding Gnocchi one.

It also replaces the metering.stack to metering.server_group. Using
"stack" need change in Ceilometer and Gnocchi configuration while
server_group will work out of the box.

Change-Id: Id81539624e5bae3487757e2167bf2ccd59c0009b
2017-06-12 07:40:19 +00:00
Jenkins fa181eeffe Updated openstack/openstack
Project: openstack/heat-templates  2cb7be482878ca2421c5c8624b2602c66ac10124

autoscaling: Remove usage of deprecated Ceilometer API

This removes usage of deprecated Ceilometer API from the hot tempaltes
Marks as deprecated the cfn template.

This doesn't update the openshift, mistral, senlin
autoscaling/autohealing templates. Mainly because I don't have the
knowledge to change where the custom metrics are send from
Ceilometer-API to Gnocchi API.

Change-Id: I4a617daf063fb1faf01c71762d6509cb00eed0b6
2017-06-06 05:09:05 +00:00
Jenkins 6031779ba5 Updated openstack/openstack
Project: openstack/heat-templates  5d85fb437d79e0a491bda7c096e37e200171ca70

Fixed MSSQL template to support 2008, 2014, 2016 versions

It has been tested with standard 2008/2012/2014 and enterprise 2016.
I've added the functions Get-MSSQLVersion that checks for the version,
and Get-MSSQLLogFile that finds the log folder for the MSSQL version used.
The function Get-MSSQLParameters has been updated to filter some install
arguments that are incompatible with versions of MSSQL diffrent from 2012.

Change-Id: I438a74b081fa6dd38d9e39c10b11497032e070cb
2017-05-25 08:04:08 +00:00
Thomas Herve bf51bc52ed Updated openstack/openstack
Project: openstack/heat-templates  1ea408fc3193da546099b3b6595d21c9e5bdf74e

Fake endpoint creation

Instead of instantiating the services, fake their creation in the
catalog to allow Heat to do validation.

Change-Id: Ic6370fa18a3fae369c22ffe0930daa7c7c42c494
2017-05-24 17:39:39 +00:00
Alex Schultz 643142f6f2 Updated openstack/openstack
Project: openstack/heat-templates  6d2659b468bab2630b1498f2f3ae6942ebd87828

Fix splay config template

The splay option was added in I88f623c9e8db9ed4a186918206a63faec8f7f673
but was missing a trailing } which leads to parse errors. This fixes the
parse errors.

Change-Id: Ic5783220f5d027e0bde0080f50f9e10cbb68289f
Closes-Bug: #1686455
2017-04-26 18:06:28 +00:00
Jenkins c5cfc8d8d2 Updated openstack/openstack
Project: openstack/heat-templates  2603dbedefcca4767348af0abe4d9b62b72dc07f

Add splay option

Add the ability to configure the splay option that was recently added to
os-collect-config.

Change-Id: I88f623c9e8db9ed4a186918206a63faec8f7f673
Related-Bug: #1677314
2017-04-26 05:33:18 +00:00
Jenkins 331d8423ad Updated openstack/openstack
Project: openstack/heat-templates  8dbb1e76c03e19d0f6fa99e80fc6ce6e493e1f45

Replace yaml.load() with yaml.safe_load()

Yaml.load() return Python object may be dangerous if
you receive a YAML document from an untrusted source
such as the Internet. The function yaml.safe_load()
limits this ability to simple Python objects like
integers or lists.

Reference:
https://security.openstack.org/guidelines/dg_avoid-dangerous-input-parsing-libraries.html

Change-Id: Ib2bfd11354c6b35c90938c1075729dc7028236a3
2017-04-09 14:54:37 +00:00
Anant Patil ee7ca49c19 Updated openstack/openstack
Project: openstack/heat-templates  7879033e7dc8a43c79c17a8ab863ee4f1d26bbbc

Use non-admin visible metrics

As per monasca documentation, the metrics starting with "vm." are only
visible to admin tenants. Since many users use this template are
non-admin tenants, this is being reflected to use non-admin visible
metrics.

Change-Id: I74201d8517dd5ab482a9f34e3a8aa725c50c8152
2017-03-27 07:45:48 +00:00
Jenkins 8ecc5659a9 Updated openstack/openstack
Project: openstack/heat-templates  570574906087be436d86efc5af25e61b41189a89

Add template for autohealing servers

This is a template to create a Server along with Aodh alarms that
trigger a Mistral workflow (via a Zaqar queue) to get Heat to recreate
the server in the event that it is stopped, deleted or goes into an
error state.

Change-Id: Iab1b206cc06715cfd7dab0dfe7cb0c3de4c698dc
2017-02-07 01:15:07 +00:00
zhangyanxian 19c757b1be Updated openstack/openstack
Project: openstack/heat-templates  824b3567ed1a0dbc328ce19b9e4d492f1f407c30

Fix typo in AD.psm1

Change-Id: If7a0f94d4f254876b8d36dde5b8b26eac95aa04c
TrivialFix:"succesfully" should be "successfully"
2017-02-06 20:46:12 +00:00
Jenkins 5362358d1c Updated openstack/openstack
Project: openstack/heat-templates  15cf0b6ebb8588428597fa435c7be52ffe30a0d3

Add zaqar.use_websockets option to o-c-c

Change-Id: Iad5d7cc77157e00fb6ba27f589fa0bf5384bab3a
2017-01-23 22:27:06 +00:00
Jenkins cbb0ad527d Updated openstack/openstack
Project: openstack/heat-templates  01b1768740f8ac6a83015876de0b5046c9874baa

Add a hook to help write json files

This patch adds a new Heat software configuration hook that
can be used to generate Json config files in a composable manner
within Heat templates.

This can be useful for everything from providing data to ad-hoc
scripts from configuring kolla containers.

Change-Id: I2b372ac2e291339e436202c9fe58a681ed6a743f
2017-01-09 23:03:28 +00:00
Jenkins ccc1b33c99 Updated openstack/openstack
Project: openstack/heat-templates  2396e34af2ccb9a56299a39090ef5ddb9351a88d

Use 'openstack' commands instead in docs

Now we suggest to use 'openstack' commands to
replace individual commands of every project.

Change-Id: I47dac03e9da1f00f33bd7caba003de0dd1a110b6
2017-01-03 08:59:26 +00:00
Jenkins c9c4e74757 Updated openstack/openstack
Project: openstack/heat-templates  3aee7e82b259bebef6878ac26379e3d5665c5dc2

Enable the use of a non-standard module-path for ansible.

This mirror the puppet hook.

Closes-Bug: #1651825
Change-Id: I19006c531591e9c02a95448007707c3f4a013633
2017-01-02 15:43:23 +00:00
Jenkins 4eec455591 Updated openstack/openstack
Project: openstack/heat-templates  51f4dd37e8fde39f1a1a712cc6f2d0abde120057

Adds sample template for Keystone domain

implements: blueprint heat-keystone-domain-resource

Change-Id: I79b493c071a9a6512448f2d0520574815caf0065
depends-on: I50cf45efa3573031b767b05b5feb447871b603f0
2016-12-28 08:03:51 +00:00
Jenkins 36a3133bd1 Updated openstack/openstack
Project: openstack/heat-templates  e7d7ad2e1ced56b95344c7cbf30848dba0c3ecae

Mark OpenShift templates as deprecated

Mark OpenShift templates as deprecated as they have not been tested on
an ongoing basis and are now superseded.

Change-Id: Ia8c4de847787ff3fa624a175f5d9d0305ac420c9
2016-12-20 20:06:24 +00:00
zhouyunfeng 667fb434a2 Updated openstack/openstack
Project: openstack/heat-templates  7546df4debf145ebe1687ddb03c143ca4a3695cc

add CONTRIBUTING.rst

The module has no CONTRIBUTING.rst file, so add it.

Change-Id: I9c8380e2d4ef8c49f472abd356010dc28c84ff98
2016-12-20 19:47:42 +00:00
Steve Baker 66959d4ef7 Updated openstack/openstack
Project: openstack/heat-templates  d10069ac13897bea8f2e296070081b74cf927e05

docker-cmd hook handle empty config file

Early in a server boot the file /var/run/heat-config/heat-config may
exist but be empty. This causes a stack trace to be raised in this
script.

This change detects a json parse error and exits gracefully.

Change-Id: I29d731098659bfbf10a2caf80c2cfc49de5df4cc
Closes-Bug: #1648249
2016-12-13 03:45:41 +00:00
Steve Baker e2bc5e689e Updated openstack/openstack
Project: openstack/heat-templates  8ab13c5489a0c5d485c4f9137a8d3a7bd2ddc214

Do docker operations in a defined order

This fixes the heat-templates gate

Change-Id: If171d93408e9252606454ce61e5923502649d2bc
2016-12-13 03:32:23 +00:00