Commit Graph

51 Commits

Author SHA1 Message Date
Zuul 28ab0afaa5 Merge "Update and replace http with https for doc links in heat-templates" 2018-03-27 15:51:04 +00:00
shangxiaobj f44b2d591d 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-01-30 12:16:43 -05:00
shangxiaobj 0e149fd2e2 [Trivialfix]Fix typos
Fix typos in heat-templates.

Change-Id: I2be63f3f6cbe25149636abd385d8f6be39b5940a
2017-07-26 02:19:03 -07: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
Stephen Gordon 8f4f1cf734 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-08-25 11:24:51 -04: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
ricolin 7535b8276a fix OpenStack typo
s/Openstack/OpenStack/

TrivialFix

Change-Id: I184639589aed9a512544f77598fe0571e93fe187
2015-11-18 17:28:45 +08:00
Chmouel Boudjnah 2b5f08c3ea Install generic latest puppet release repository
We need the latest version of puppet-release or we would not be 
able to pull up the right ruby version to install OpenShift.

Change-Id: Ic7ad9ff7645c97133f4f69df839c9a2d33098476
2015-01-19 12:55:31 +00:00
Jenkins f35e89b5c3 Merge "Remove underscore in autoscaling group name" 2014-12-25 21:45:04 +00:00
Steve Baker 0eb02df3b9 Fix env parameters for os_node.yaml
This is causing gate-heat-templates-dsvm to fail

Change-Id: I81fb32b3328752fdd7f0173ab8ef65e8f9c874a9
2014-12-04 14:44:45 +13:00
JUNJIE NAN 87d60e02ed Remove underscore in autoscaling group name
Since autoscaling group name contributes to hostname, and there should
have no underscore in it so we remove the underscore.

Change-Id: I5e5848ed5f132f06ebf601f73369653c807e413d
Partial-Bug: #1394096
2014-11-21 18:19:16 +08:00
Jenkins 1c22cc9f21 Merge " New heat templates for Openshift-Origin deployment using scalability functionality" 2014-09-02 01:50:13 +00:00
Antoine Abélard dd8cb1c9ad New heat templates for Openshift-Origin deployment using scalability functionality
New heat templates for Openshift-Origin deployment using scalability functionality.
    Templates are based on the Openshift-Origin template
    (https://github.com/openstack/heat-templates/tree/master/openshift-origin/F19).
    The aim is to add scalability functionality to this template. Metric use
    for the scalability are cpu_util and nbgears. This second metric is
    a custom metric implemented by a bash script calling by cron to get
    from the broker node the number of gears used and the number of node
    connected, to determine when a new node is needed. The data is send to
    the Ceilometer V2 API and used in the heat template.
    To avoid compatibility issues due to changes in this project or
    in Puppet modules it depends, versions parameters are provided in hot templates.

    I implemented 5 templates :
    aws format :
      - openshift (1 node and 1 broker)
    hot format :
      - openshift (1 node and 1 broker)
      - openshift-scalable-cpu (scalable openshift environment using cpu_util metric)
      - openshift-scalable-nbgears (scalable openshift environment using nbgears custom metric)
      - openshift-scalable-cpu-nbgears (scalable openshift environment using cpu_util metric and nbgears custom metric)

Change-Id: Idfdf158ff6176c5ef6902e27a6e764e23171cf4c
Implements: blueprint heat-openshift-templates
2014-08-28 13:56:10 +02:00
Jenkins e9d97c4303 Merge "Fix template validation" 2014-08-12 22:46:58 +00:00
Jenkins f5e0cd3071 Merge "Adds Support for Recent Puppet Module Refactor" 2014-08-04 04:42:14 +00: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
Jeff Peeler d357422cf6 Add HA templates to deploy OpenShift on CentOS
These templates are heavily based on the existing OpenShift enterprise
templates for use with RHEL. The OpenShift installer utilized in these
templates has been slightly modified to support CentOS as well as make
the install completely automated (aside from creating districts if so
desired.)

Change-Id: I74acfdd553eb6a4c7ac771b6c0ec6543e1e63ea9
2014-07-16 01:04:26 -04:00
danehans eae4b474cb Adds Support for Recent Puppet Module Refactor
The puppet-openshift_origin module recently went through a
refactor in preperation for the v4 OSO release.  This patch
changes the necessary puppet parameters for the template to
continue functioning.

Change-Id: Ia9145ebf744e45ee3c7341a04f05d257515a976d
2014-05-12 04:18:43 +00:00
aweiteka 65a4f8bebc Secure private repo files added to environment
The yum repo files had insecure settings for sslverify and
gpgcheck. Also change references to http to https.

Change-Id: I10cbc33a734f9ed36ef6f22174c65efaf3b659d7
2014-04-04 13:20:00 -04:00
Jenkins e564ec5a9e Merge "Add template for separated node/broker OpenShift" 2014-03-25 09:13:08 +00:00
Jeff Peeler 8ec94fcae0 Add template for separated node/broker OpenShift
This adds a new template for deploying OpenShift Origin on CentOS. In
this case two hosts are used with separated node and broker roles.

Change-Id: Iabf125b2ea9c0e0d45dfb9444017de6d55798d1f
2014-03-24 13:57:18 -04:00
Jeff Peeler 22cfa20b2b Correct a few typos and remove nan workaround
Constraints was misspelled, however the default value would work fine if
instance_type wasn't specified. The list syntax for HOT was also
incorrect.

There was a dependency problem that is fixed now, so force installing
nodejs-bson is no longer required.

Change-Id: Iabc9ff4be7cfa479d6cf11f735857f16b3de4905
2014-03-18 23:30:02 -04:00
Jenkins da14a9b0b7 Merge "Adds Hostnames for OSO Instances" 2014-03-18 19:02:54 +00:00
Jenkins 90d2c31a1f Merge "Fixes Neutron Security Rules for Mcollective Communication" 2014-03-18 19:00:48 +00:00
Jenkins a2f145b85e Merge "Changes Neutron Security Group Ports to Integers" 2014-03-18 19:00:36 +00:00
danehans c5fdbd94c2 Fixes Node Wait Condition
Previously, the Node Wait Handle/Condition referenced the Broker
instead of the Node.  This caused the Heat stack to show complete
prior to the Node being truly configured and ready.

Change-Id: I7ab1dce8de0b892e3495ef16c26dc8e8bd0475b7
2014-03-07 18:34:15 +00:00
danehans 5d8830bcba Fixes Neutron Security Rules for Mcollective Communication
Previously, neutron security rules were incorrectly specified
to allow ActiveMQ TCP ports.  This was not previously observed
since a single OpenStack Compute Host was used to run Broker and
Node instances. Additionally, duplicate entries for ActiveMQ
TCP port 8161 were specified.  This patch removes the duplicate
entries and changes the TCP port number from ActiveMQ to
Mcollective (61613).

Change-Id: Ia35267a4485bba4aab36b9a629993ab94f42ad11
2014-03-06 18:53:08 +00:00
danehans e005415ad4 Changes Neutron Security Group Ports to Integers
Previously, neutron security group tcp/udp port numbers were
defined as strings.  This was not an issue when testing with trunk
but is an issue when testing with 2014.1.b2.

2014.1.b2 expects the parameters to be defined as integers not
strings.  When the tcp/udp ports are defined as integers, the
security group rules work with trunk as well as 2014.1.b2.

Change-Id: If7e5af163993b4cad3f31583ea73e9e856ab0ccb
2014-03-06 18:34:07 +00:00
danehans e499b66b0c Adds Hostnames for OSO Instances
Previously, the OSO broker/node instances would get spawned
using a combination of stack name, nova instance name and UUID.

This patch allows a user to specify a hostname for broker and
node instances.  It makes working with broker/node instances
much easier from a user's perspective.

Change-Id: Ib077acb257e5add6c36b4a913cc6752c716524a7
2014-03-05 22:07:08 +00:00
Jenkins fce7851c39 Merge "Adds Support for OpenShift Origin v3.0 on Fedora 19" 2014-02-27 17:20:16 +00:00
Jeff Peeler 5cd57e83e3 Add template for single node instance of OpenShift
This has been tested on CentOS 6.5 as far as the deployment guide
indicates in section 11:
http://openshift.github.io/documentation/
oo_deployment_guide_comprehensive.html#testing-the-configuration

Change-Id: I40766a46fb45e618e35a4f7a3662bd693ac8613c
2014-02-25 17:57:20 -05:00
danehans 0ef389bf0d Adds Support for OpenShift Origin v3.0 on Fedora 19
Previously, Heat templates and image building only supported OSO
on F18.

Change-Id: If1bfb30a6e1e1f609d7345f61e812c5d1623d386
2014-02-25 05:42:35 +00:00
Steven Dake a980af8e15 Make room for F19 OpenShift Origin Files
Move F18 OpenShift origin files into the F18 directory

Change-Id: I3318347085a1e640839c41ab58e233835e185f49
2013-10-08 17:16:32 -07:00
Steven Dake c06788efff Add a heat-cfntools element for openshift-origin
heat-cfntools from the tripleo-image-elements repo is a bit heavyweight.

Instead this element simply installs the latest repo package of heat-cfntools
and symlinks to /opt/aws/bin.

Change-Id: I5a0ec433c352f3ac0bb415381c7e41d4370d1e85
2013-08-07 03:31:36 -07:00
Zane Bitter 74a7c15b76 Improve formatting of OpenShift Origin README
Fix the bullet list, and add a title.

Change-Id: Icfa04bfbbb54cbaf244fc43041c4be24a9c5c0b9
2013-06-13 10:21:07 +02:00
Zane Bitter 9ab4e47f27 Fix script formatting in OpenShift README
Change-Id: I4acea16ea63fadb2f42de58f55371ea7ba94da30
2013-06-13 09:58:24 +02:00
Steven Hardy 5e92be740d Fix F18 oz-install failures
F18 builds are unreliable (or for some people don't work at all),
this seems due to the following bug:

https://bugzilla.redhat.com/show_bug.cgi?id=906031

The simplest workaround is to use the netinst ISO instead of the DVD
so we pick up the newer curl package which fixes the problem

Fixes bug #1185810

Change-Id: I066356e8a780caa8ca2798644ec7594b0536005c
2013-05-30 14:24:59 +01:00
Steve Baker 0f99951257 Move autoscaling metrics from nodes to broker.
Broker has scripts /etc/heat/notify-scale-up and /etc/heat/notify-scale-down
which will trigger heat autoscaling.

Scaling decisions will be made within the broker itself using its own
platform agnostic scaling scripts:
https://github.com/openshift/openshift-extras/tree/enterprise-1.1/node-manager

This template has successfully scaled up from 1 to 3 nodes, and scaled back
down to 1 by manually executing notify-scale-up and notify-scale-down.

Change-Id: Idb9920438bbe598b610efc8eca5bc158181b74a7
2013-05-30 14:17:27 +12:00
Steve Baker 8b4a030af5 Port OpenShiftAutoScalaing to yaml
This deploys an identical stack to the original json.

OpenShiftAutoScaling.template has been deleted to reduce
maintenance burden.

Change-Id: Ie2840f65ed0d6f6964b4be71d6b19368e844bac4
2013-05-30 10:50:40 +12:00
Steve Baker 20cc5eaf24 Additional OpenShiftAutoScaling launch parameters.
- Server flavors for broker and nodes
- Min and max node server counts for autoscaling policy

Change-Id: I70835beca8e29e33c3e8b25cc57d5321a4df7c11
2013-05-29 15:25:18 +12:00
Steve Baker 28deec9130 OpenShiftAutoScaling and OpenShift feature parity.
Updates OpenShiftAutoScaling.template with fixes contained in
OpenShift.template.

Nodes do scale when the hard-coded cfn-push-stats value is raised
above the threshold.

Change-Id: I79051a15a5116034d06fd95b5cc8c3412eda33a8
2013-05-29 12:35:25 +12:00
Steve Baker 256dde309f diskimage-builder elements for openshift-origin
These have been used to deploy a working openshift stack.

They pre-install more images than the oz templates, based on the yum
log of extra installs during boot time.

Change-Id: Icb246033964e1388aeebdd4229790acfe0e17718
2013-05-29 12:35:25 +12:00
Steve Baker 5f02b2f221 Tidy up and make OpenShift.template work
With these changes it is now possible to launch the wordpress
gear on the node.

Changes include:
- set environment variables at the start of the UserData and use them
  throughout instead of heat refs
- set /etc/resolv.conf to point at the broker's bind
- on the broker run setsebool -P httpd_unified=on
  oo-accept-broker suggested this was necessary, and the console errored
  until it was set
- enforce selinux, it was left in permissive mode
- setsebool httpd_unified needs to be set on the broker
- node /etc/resolv.conf needs to be overwritten after puppet apply
- Outputs for console URL and nameserver entry for DNS resolution of apps

Change-Id: I28c9ce4b19f4a0aa59ef514a269ae30b6fb9f6fa
2013-05-29 12:35:19 +12:00
Steve Baker 0a07dd25cd Generate the DnsSecKey inside the broker.
This means that the broker also hosts the bind server.

Change-Id: I29e79a64868ce5f4e7a3ab4dae45d7e361375ac1
2013-05-28 16:57:31 +12:00
Steve Baker b306f94c89 OpenShift.template fixes
This includes the following changes:
- requests from outside the broker were not reaching it without
  setting configure_firewall => true
- puppet module install was failing due to missing /etc/puppet/modules
- on the node puppet --apply was failing because the openshift_origin
  module wasn't installed
Change-Id: Ie6f1f0f6e2bdbde1521ffdd285041c87f3933e42
2013-05-28 16:38:12 +12:00
Steve Baker 92a15bdd92 Initial openshift autoscaling template.
As authored by Steve Hardy <shardy@redhat.com>

Change-Id: I39773ba7cc8ba5e4ce6555fc3c3aa84cec7937c7
2013-05-28 12:37:14 +12:00
Jenkins e24ac943be Merge "F18 openshift tdls, remove boto pip install" 2013-05-25 05:16:36 +00:00
Steven Hardy bb866777ba F18 openshift tdls, remove boto pip install
Remove explicit version dependency for old boto version, as this
won't work with the Fedora packaged cloud-init, and heat no longer
requires this version, so we should use the Fedora boto package

Change-Id: Iaf340b4793fdf7ffc3f9b3d0197ca9f6ba6f42fe
2013-05-24 15:43:24 +01:00
Steven Dake 8f19ddc364 Resolve CVE-2013-2069
Fix problem where root escalation is possible in a VM.

For more details:
http://lists.fedoraproject.org/pipermail/announce/2013-May/003157.html

Change-Id: I95013d8155d0338c4161a6cb87f02974973fcf80
2013-05-24 01:43:32 -07:00