503 Commits

Author SHA1 Message Date
Jenkins
25c9f45199 Merge "New template: Example for Neutron Trunks" 2017-07-17 03:51:17 +00:00
Jenkins
36a473a03f Merge "autoscaling: fix a type in gnocchi command" 2017-07-13 20:05:56 +00:00
Mehdi Abaakouk
c03afdfd0d autoscaling: fix a type in gnocchi command
Change-Id: I85b15ebd2f294b82d16e63527d3b447a1267d6e3
2017-07-10 20:33:19 +02:00
Bence Romsics
cfda4db51d 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-10 08:45:20 +02:00
ricolin
e4df67e265 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-08 03:47:08 +00:00
Spyros Trigazis
1351cc322b 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-06-22 10:45:34 +02:00
Jenkins
69c1326442 Merge "autoscaling: don't query an no more existing API" 2017-06-12 07:40:19 +00:00
Mehdi Abaakouk
9ac17bff58 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-08 09:20:30 +02:00
Jenkins
2cb7be4828 Merge "autoscaling: Remove usage of deprecated Ceilometer API" 2017-06-06 05:09:05 +00:00
Jenkins
5d85fb437d Merge "Fixed MSSQL template to support 2008, 2014, 2016 versions" 2017-05-25 08:04:08 +00:00
Mehdi Abaakouk
de990777bd 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-05-23 07:48:04 +02:00
Thomas Herve
1ea408fc31 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-18 10:52:22 +02:00
Alex Schultz
6d2659b468 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 10:30:11 -06:00
Jenkins
2603dbedef Merge "Add splay option" 2017-04-26 05:33:18 +00:00
Jenkins
8dbb1e76c0 Merge "Replace yaml.load() with yaml.safe_load()" 2017-04-09 14:54:37 +00:00
Alex Schultz
c09f1d0cde 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-06 15:22:27 -06:00
Anant Patil
7879033e7d 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 06:37:49 +00:00
chenaidong1
bb79184e69 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-03-10 16:18:30 +08:00
Jenkins
5705749060 Merge "Add template for autohealing servers" 2017-02-07 01:15:07 +00:00
zhangyanxian
824b3567ed Fix typo in AD.psm1
Change-Id: If7a0f94d4f254876b8d36dde5b8b26eac95aa04c
TrivialFix:"succesfully" should be "successfully"
2017-02-06 03:54:30 +00:00
Zane Bitter
c975f6b179 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-03 10:22:23 -05:00
Jenkins
15cf0b6ebb Merge "Add zaqar.use_websockets option to o-c-c" 2017-01-23 22:27:05 +00:00
Jenkins
01b1768740 Merge "Add a hook to help write json files" 2017-01-09 23:03:28 +00:00
Jenkins
2396e34af2 Merge "Use 'openstack' commands instead in docs" 2017-01-03 08:59:26 +00:00
huangtianhua
41927fa086 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 06:42:36 +00:00
Jenkins
3aee7e82b2 Merge "Enable the use of a non-standard module-path for ansible." 2017-01-02 15:43:23 +00:00
Dan Prince
08725114a8 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-01 14:59:00 -05:00
Jenkins
51f4dd37e8 Merge "Adds sample template for Keystone domain" 2016-12-28 08:03:51 +00:00
Sofer Athlan-Guyot
7e98f208ed Enable the use of a non-standard module-path for ansible.
This mirror the puppet hook.

Closes-Bug: #1651825
Change-Id: I19006c531591e9c02a95448007707c3f4a013633
2016-12-23 12:10:35 +01:00
Dan Prince
176d14a814 Add zaqar.use_websockets option to o-c-c
Change-Id: Iad5d7cc77157e00fb6ba27f589fa0bf5384bab3a
2016-12-22 16:43:38 -05:00
Jenkins
e7d7ad2e1c Merge "Mark OpenShift templates as deprecated" 2016-12-20 20:06:24 +00:00
zhouyunfeng
7546df4deb add CONTRIBUTING.rst
The module has no CONTRIBUTING.rst file, so add it.

Change-Id: I9c8380e2d4ef8c49f472abd356010dc28c84ff98
2016-12-20 15:18:38 +08:00
Steve Baker
d10069ac13 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 09:57:52 +13:00
Steve Baker
8ab13c5489 Do docker operations in a defined order
This fixes the heat-templates gate

Change-Id: If171d93408e9252606454ce61e5923502649d2bc
2016-12-13 09:57:52 +13:00
Jenkins
67e02ce57c Merge "Allow ansible inventory to be configurable" 2016-12-06 02:52:58 +00:00
Mocan Cosmin
3670644334 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
2016-11-28 10:08:35 +00:00
Jenkins
84d3ce7aed Merge "Show team and repo badges on README" 2016-11-28 05:17:03 +00:00
Flavio Percoco
93cbebb3ce Show team and repo badges on README
This patch adds the team's and repository's badges to the README file.
The motivation behind this is to communicate the project status and
features at first glance.

For more information about this effort, please read this email thread:

http://lists.openstack.org/pipermail/openstack-dev/2016-October/105562.html

To see an example of how this would look like check:

https://gist.github.com/af4bfde1e9915d6835abcceb2907b603

Change-Id: Iafff19d2a69b5e5331632ade3071a6c8d362997c
2016-11-25 17:18:53 +01:00
huangtianhua
5b36b6fb38 Add example to configure ca certificates with userdata
Add template example to configure ca certificates when the
instance boots for the first time.

Change-Id: I016f67cf3af7b17482c0124eb07ffa67c0545bb0
2016-11-24 14:42:33 +08:00
Jenkins
a6a6861ff1 Merge "docker-cmd hook" 2016-11-16 03:07:12 +00:00
Steven Hardy
3aeb4359b9 Correct tags option position in ansible hook
I made a mistake with the argument ordering, these need to go
before the playbook name

Change-Id: If7d2dc9f9a09d1c9feb78c3a8cbb2980c3e647f4
2016-11-15 18:38:17 +00:00
Juan Antonio Osorio Robles
af01bb96ce Set content-type for SoftwareConfig's heat-config-notify
What the heat-config-notify actually POSTs/PUTs to heat is JSON, so
the content-type should be updated as such.

Change-Id: I85e116bec524ba37e96c5761346084ab149601cc
Related-Bug: #1641589
2016-11-14 16:59:22 +02:00
Alex Schultz
b1714b244d Add local logging output to puppet hook
This change updates the puppet hook to write out logs to the local node
if verbose or debug is enabled for the hook. The logs will be written
out to the /var/log/puppet/ folder that currently is empty at all times.
We will continue to output logs to the console for the traditional heat
processing of the stdout and stderr but will also write out the logs
locally only if debug or verbose is enabled for the puppet apply.

Change-Id: Idfbfc030350827a4653b26cef7c7deca92b0e05d
Closes-Bug: #1536009
2016-11-08 09:08:21 -07:00
Kanagaraj Manickam
2beada6eba Adds sample template for Keystone domain
implements: blueprint heat-keystone-domain-resource

Change-Id: I79b493c071a9a6512448f2d0520574815caf0065
depends-on: I50cf45efa3573031b767b05b5feb447871b603f0
2016-11-04 11:45:35 +05:30
Steve Baker
2baf44a32c docker-cmd hook
This hook takes the same format as the docker-compose hook, but makes
calls directly to the docker command rather than calling
docker-compose.

This hook currently supports the docker-compose v1 format, but in the
future will support other formats such as the kubernetes pod format.

TripleO will adopt this hook and will transition to using the pod
format when this hook supports it.

Co-Authored-By: Ian Main <imain@redhat.com>

Change-Id: I699107c3df64723a945c5d5ac82ae3a48b76700e
2016-11-04 16:13:18 +13:00
Steven Hardy
06205231a3 Add option to pass tags to the ansible hook
Currently we don't support options for the ansible hook, but it would
be useful to enable passing tags, like we already do for the puppet
hook.

Change-Id: Idf7e3aa520fd40a2c4c00b2d26c3c608059bb51d
2016-11-03 17:43:51 +00:00
Dan Prince
40a4ed0841 A hook which writes hiera datafiles.
This patch creates a hook that writes hiera.yaml and datafiles
to disk. This approach works well for users (like TripleO)
who prefer to maintain Hiera in a more composable manner with
Heat structured config resources rather than specifying all
the Hiera values for each puppet config resource.

Partial-bug: #1596373

Change-Id: I21639f6aadabf9e49f40d1bb0b1d0edcfc4dbc5e
2016-10-05 21:29:02 -04:00
Dan Prince
7c5aae183a A hook which invokes os-apply-config.
The intent is for this element (hook script) to be used in place of the
one in tripleo-image-elements which relies on an external signal handling
shell script at the end of the os-refresh-config run
(99-refresh-completed).

This version will run os-apply-config and return a signal immediately.
Because it uses the heat-hook mechanisms it also supports a broader set of
signal handling capabilities... which 99-refresh-completed doesn't fully
support.

Change-Id: Ic9402ff93cbc840bec1debcd8881de563d03cbf0
2016-09-29 14:46:45 -04:00
avnish
f123aa1491 modify the home-page info with the developer documentation
Change-Id: If0b5ebcd4f8910d3ba07ceca087888b1a8972111
2016-09-20 12:36:44 +05:30
Nguyen Hung Phuong
1e6015d4b2 Clean imports in code
This patch set modifies lines which are importing objects instead
of modules. As per openstack import guide lines, user should
import modules in a file not objects.

http://docs.openstack.org/developer/hacking/#imports

Change-Id: I4c34416623ac6899ab8b780bdd668acb414d09ef
2016-09-08 15:41:51 +07:00