Commit Graph

48 Commits

Author SHA1 Message Date
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
Adrien Vergé 2a2fe91602 Fix linting errors in YAML
This change corrects many problems detected by the `yamllint` linter.
It's a preparation for enabling this linter in change
Ie746230f28fe3ed0cf218201d5a3810f7bc44070.

For instance, the first run of the YAML linter helped discovering a key
duplication problem in `oso_ha.yaml`: the `depends_on` key was present
twice, so the first occurence was ignored.

Other changes are cosmetic: extra spaces, extra blank lines, missing
newlines at end-of-file, etc.

Change-Id: I7f2369adfb152fd2a74b9b105e969e653e592922
2016-03-11 14:57:38 +01:00
Kanagaraj Manickam 96a0b0b3d2 Fix for heat-template build failure
In mitaka, a new feature is introduced to ignore a given
set of errors and is used here to fix the zuul faliure.

In addition, it fixes the invalid template errors.

For those templates which causes circular error is
moved to invalid folder

NOTE: openshift-origin/centos65/highly-available is marked
as invald to make the build jobs to pass.

depends-on: I4a3043fd17b69a346d447dfbd17488040cf9b387
Change-Id: I7b5b72cb8f6ff53b82edf92799a57917c718e032
Closes-bug: #1554380
2016-03-10 19:49:28 +05:30
Kanagaraj Manickam a288b370f5 Fixes zuul failure
template-validate is now updated to validate the template
by using stack create validation path, which causes some of
the existing templates in this repository to fail.
so this patch is added to mark them as invalid and skip them
as part of template validation.

It was failing becuase of circular reference among the resources
in these invalid templates.

depends-on: I15891196be94d1e100869edeba0a7ef557edb36a
Change-Id: I6a003f35495bb43e0ca2a824eb9e503c4059c37a
2015-10-04 02:06:05 +00:00
Anant Patil f939f38514 Add output section.(2)
Adding output section to templates to make most use of the template.

Change-Id: I0839642427ece9eed58be3209d98b8fbef745a5b
2015-04-29 16:32:00 +05:30
Bruno Bompastor ff53051e5a Fixes circular dependency check and alarm action
This template is not compatible with the new circular
dependency check introduced in Juno. Also the alarm action
needs the alarm url.

Change-Id: I6fc98b3609aead581d99ab4d39dd91f39990c0a5
Closes-Bug: 1401062
2014-12-16 11:17:52 +01:00
Jenkins 934233a0a6 Merge "Added simple samples that exercise autoscaling" 2014-09-11 15:40:55 +00:00
Mike Spreitzer ac8502c45d Added simple samples that exercise autoscaling
Added trivial templates that can be used to exercise basic
scaling group functionality: the mechanics of the scaling
actions.  These examples are deliberately spare, to
minimize dependencies.

Change-Id: Iddd63acc629d617f861215c12e20d250c53edd11
Partial-Bug: 1305425
2014-08-26 13:24:56 -04:00
Thomas Herve 6aa7391ce8 Fix template validation
Fix issues introduced recently in template validation: a typo in a
wordpress template and environments files not named properly.

Change-Id: I8c3c11cfac841c02e700c62b8365821519985267
2014-07-18 08:34:38 +02:00
Steven Hardy 8d360e00b4 Remove misleading OS choices from legacy F17 examples
These examples all mention alternative OS versions, which is confusing
to users, especially the ubuntu one, which will definitely not work and
evidently is causing confusion for users.

So remove the references to anything other than F17 (which these did work
on at one point).  Obviously we still have to refresh these at some point
to make sure they still work on a non-EOL version of Fedora, but hopefully
this somewhat reduces confusion in the meantime.

Change-Id: I9d40f44f86e40f7d67fa4c3340b7fc6ad01bf270
2014-06-13 09:51:03 +01:00
Ethan Lynn 01f366f66c Correct Ubuntu WordPress Template
Original template can't install or config wordpress on ubuntu.
Modify wordpress workflow in ubuntu template, and move this
template to cfn/deb.

Change-Id: Ic7143280d1fb8b8580d5095b90ac93b97c899e24
2014-05-07 09:50:01 +08:00
Jenkins 7cdd4c6a8e Merge "Move rackspace templates in a contrib directory" 2014-04-28 22:57:00 +00:00
Jenkins ddcfded9af Merge "Fix WordPress_Single_Instance_deb.template" 2014-04-28 22:34:21 +00:00
Mike Spreitzer 0f075e0461 Worked on Fedora 20 examples in HOT
Fixed the image names in hot/F20/WordPress_Native.yaml to match what
DevStack will do with date-independent configuration.  Adapted the
2-instance WordPress example.
Turned off SELinux where it hurts.

Change-Id: I373700de873e6e375622ab65bd4a175af96d217f
Partial-Bug: #1305425
2014-04-25 06:56:15 +00:00
Thomas Herve 390fb36e7f Move rackspace templates in a contrib directory
The patch moves the templates using rackspace resources in a contrib
directory and excludes them from the validation tool.

Change-Id: Ib9bdb642439468aca27804c00d2c53d5ed9ed2b4
2014-04-23 16:51:41 +02:00
Thomas Herve dc296ee8f1 Fix WordPress_Single_Instance_deb.template
Change AllowedValues in WordPress_Single_Instance_deb.template to be a
list.

Change-Id: I1c9da1ccd3216f355c3a60b27473642ed4076655
2014-03-28 13:34:08 +01:00
Thomas Herve de8439c84d Delete WordPress_Single_Instance_puppet.template
It uses AWS::RDS::DBSecurityGroup that we don't support. Maybe we can
reinstantiate it one day if we do support it.

Change-Id: Ia97a7f70a8905c7ef1b063a9c8eb551560b932e6
2014-03-27 16:25:22 +01:00
Bill Arnold 454491d6da Remove tag to allow default resolved group id
Change-Id: I2ff271cc0c41fd7801e18cf6795d4fb9134adc18
Closes-Bug: #1290980
2014-03-21 14:07:57 -04:00
Jenkins 50d93d7070 Merge "Fix MultiNode_DevStack template" 2014-01-09 03:33:05 +00:00
Simon Pasquier 3c910126a5 Fix MultiNode_DevStack template
The ComputeNodes parameter has to be changed to String instead of a
Number otherwise the UserData property cannot be resolved properly.

Change-Id: I9ddb9154c380f1d0aa1cf47e7bb646a304e59e68
2014-01-03 15:32:56 +01:00
Steven Dake 1d76512ae1 OS::Metering::Alarm -> OS::Ceilometer::Alarm
Don't require any special yaml mappings in the environments
section to deal with metering

Change-Id: Ic7055e326cf8f75f97047f028c767ee8bc944fe8
2013-12-17 08:19:29 -07:00
Jenkins 46eab20118 Merge "Add all devstack nova instance types to F19 WordPress_NoKey" 2013-11-19 00:49:20 +00:00
Swann Croiset 7cbca520a3 Fixes of the alarm creation for the auto scaling example
s/counter/meter
s/group_name/groupname
use the 'Ref' of the ASG for the matching metadata

Change-Id: I2f55571e991dd90e7f1047bfda581052c31d3770
2013-11-05 10:59:22 +01:00
Steven Hardy f9d687a9d7 Rename Quantum resources and templates to Neutron
Although these still work due to environment mappings, we should stop
using the old names

Change-Id: I2f08b17690405967721adbd543af5ea1d17ed4e7
2013-10-24 09:46:11 +01:00
Jenkins 5e9b40be2b Merge "VPN service template" 2013-10-11 16:53:39 +00:00
Bartosz Górski dc6c4c4745 VPN service template
Adds template example for VPN service components.
Creates new network and router with vpn serive and server contected to
created network.

Change-Id: Ic77b3f752c560fe2b964bb7425dfd43a65bd4cc5
2013-10-07 09:46:10 -07:00
Steven Dake 65e5eb639c Add all devstack nova instance types to F19 WordPress_NoKey
Add the m1.micro, m1.nano, and m1.xlarge instance types to the
WordPress_NoKey sample.  In the process, any devstack type that
requires atleast 2048MB of ram are mapped to i386 images, and those
requiring more are mapped to x86_64 images.

Change-Id: I48e696697436cfc820a91aa2096c94aec06cd769
2013-10-05 13:42:29 -07:00
Steven Dake ff8e83afa2 Remove error on launching WordPress_NoKey template
Receive error:
ROR: Property error : WebServerSecurityGroup: SecurityGroupIngress
  SecurityGroupIngress: 0 0: FromPort Value must be a string

quote the values instead

Change-Id: I96c3dfb850105219c144be293f93e010f271c5e2
2013-10-05 11:15:10 -07:00
Jenkins ef164dd5b4 Merge "Adding multi-node DevStack template for Ubuntu" 2013-09-19 22:13:39 +00:00
Steven Hardy 223b6b3b3b F18 WordPress_NoKey fixes
The security group properties must be strings or we get validation
errors, and firewall-cmd rule addition should be permanent

Change-Id: Ia03947690ff8142b6e700c808a898283c7b8d095
2013-09-18 14:28:30 +01:00
Steven Hardy fbcdeb7004 Add working F18 WordPress template
Add an updated WordPress_Single_Instance template which works with
F18 guests

Change-Id: I6651163b91709a6ab566f8d6060c4766a1d4603f
2013-09-18 14:27:57 +01:00
Simon Pasquier 0401f6f2bd Adding multi-node DevStack template for Ubuntu
Adding a template that deploys a multi-node OpenStack installation using
DevStack. This template has been tested on Ubuntu and may work as-is on
Debian too.

Note that the security group resources require to use Neutron and Havana
Heat.

Change-Id: Ibdf4fe7407913f75b2253b09639554c013d31c01
2013-09-18 10:33:29 +02:00
Steven Hardy 7cbe610b26 Fix broken URL references
Some templates still reference the old URL, before the
templates got categorised by Fedora version.

Change-Id: Ie76c8f982b3254f31d7f213110796f5e6371dd72
2013-09-13 09:02:16 +01:00
Steven Dake f97e85bc4d Wordpress NoKey template for F19
Example F19 WordPress NoKey template

Note mariadb changed and the upstream images do not ship with
firewalld enabled, but instead all incoming connections are blocked.

Change-Id: Icdd9c90bb5a3174bcae65cdc8eceadb4a11ed900
2013-08-07 04:02:12 -07:00
Steven Dake a2ad92fa58 Add F17, F18, F19, U12 subdirectories for templates
This change makes it possible for us to properly maintain example templates
for various distributions by organizing them into subdirectories.

Change-Id: I06e4d24cae83330af97870bab1e6795999218d1e
2013-08-04 18:55:34 -07:00
Jenkins 33a1ec5f84 Merge "Provide example F18 NoKey example" 2013-08-04 22:29:40 +00:00
Jenkins 9bcca34746 Merge "Make YAML template easier to read" 2013-08-02 00:12:18 +00:00
Steven Dake 22d532c76c Provide example F18 NoKey example
F18 requires some firewalld magic to enable http

Change-Id: I3e8ac256ee09af68d772b23690ed1ed368e04938
2013-07-31 10:54:25 -07:00
Angus Salkeld dec168ea38 Add an auto scaling template that uses Ceilometer
blueprint: watch-ceilometer
Change-Id: I0f419b3a490a728727f6288c45e4a7c9fcdb1862
2013-07-26 14:52:03 +10:00
Zane Bitter e66db0d046 Make YAML template easier to read
- Use folded block for Description
- Clarify description text
- Don't use JSON-style notation for Parameters
- Join UserData script with newlines to make it more readable
- Rename nonsensical 'WikiDatabase' instance to WebServer

Change-Id: Ieb7925e3fdb0e7f65fd6f69b9e9bbcd0235587da
2013-07-24 16:09:34 +02:00
Jason Dunsmore ccc3dcbe33 Add a WordPress template for Rackspace Cloud Servers
Change-Id: I9bfecc035667a66579e9cac720a0d150ee6518f9
2013-06-21 15:34:30 -05:00
Steven Dake 054faa73bd The NoKey template references gold images which don't exist and doesn't run cfn-init
Change-Id: I726cc53d099292ef91ccecb7c784e3757e356b68
Fixes: Bug #1186791
2013-06-02 12:22:22 -07:00
Zane Bitter d61d84edbb Explicitly specify AZ for boot volume
If a volume is to be used as a boot volume (i.e. attached to the
Instance prior to creation using the Volumes property, rather than
afterwards with a VolumeAttachment), then it cannot obtain the
AvailabilityZone (which, if not specified, is assigned dynamically) from
the Instance, since that has not yet been created and assigned to an AZ.
Instead, require the AZ to be specified as a parameter.

Change-Id: Icccc9b531b1fd7754d76c13d90679ed04c9c0d02
2013-05-28 19:01:22 +02:00
blues-man 4f3ad5a11e Update links to heat-templates repo
Change-Id: Iafb708287c522853a257053038eaa1e9dda29009
2013-05-27 18:09:47 +02:00
Steve Baker 573aba1a52 Move OpenShift Origin related files to own directory.
This is consistent with top-level heat-templates directories
being targetted at different audiences.

This directory may also contain autoscaling templates, yaml variants
and diskimage-builder elements.

Change-Id: Id6f9084e57104f58c65bdf94c7d799e3773f7541
2013-05-23 14:33:35 +12:00
Zane Bitter b822d44a9c Make DeletionPolicy a resource attribute instead of a property
Copy example template changes from Idb0d275c44661db341f693d9d80629661d66c7ac
Ref bug #1160779

Change-Id: Ic86473d26778ac601599d2f4e39162a3eb479b9d
2013-05-08 13:00:20 +02:00
Steve Baker 1d378fd4f9 Standardize template instance types on nova defaults
Based on the following
$ nova flavor-list
+----+-----------+-----------+------+-----------+------+-------+
| ID | Name      | Memory_MB | Disk | Ephemeral | Swap | VCPUs |
+----+-----------+-----------+------+-----------+------+-------+
| 1  | m1.tiny   | 512       | 0    | 0         |      | 1
| 2  | m1.small  | 2048      | 20   | 0         |      | 1

- m1.small is specified as the Default for InstanceType parameters
  (previously this was m1.medium or m1.large. It would be better if
  there was a flavor with 1GB memory, but m1.small is the next most
  appropriate.)
- m1.tiny is the only flavor mapped to Arch=32 in AWSInstanceType2Arch
- AllowedValues and AWSInstanceType2Arch mapping is now limited to the
  following nova defaults:
  [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ]

This will allow heat/tools/nova_create_flavors.sh to be deleted.

Part of blueprint default-nova-flavors

Change-Id: Ia8bba4bd17a2d665676104fbdeb1e188b55aeeaf
2013-05-07 16:42:53 +12:00
Steven Hardy de67cecf92 Initial import of heat repo content
Initial import of content which currently exists in the main heat repo

Change-Id: I326801f7e7274a1f8b41d4e0be733da0f80ebbcc
2013-04-27 13:51:55 +01:00