summaryrefslogtreecommitdiffstats
path: root/environments
AgeCommit message (Collapse)AuthorFilesLines
2016-06-14Enable nova-scheduler as a composable serviceEmilien Macchi1-0/+1
Implement NovaScheduler service using nova-base for common parameters. Depends-On: I5e1c90e3c6dc556f872ced73744c5c74caaa3635 Change-Id: Ie50716a09c53d656835b16991128c94b35cf1ed2 Implements: blueprint composable-services-within-roles
2016-06-14Enable nova-api as a composable serviceEmilien Macchi1-0/+1
Implement NovaApi service using nova-base for common parameters. Change-Id: Ibcb89b332ab73f18d05e5b2e454964e322b982e6 Implements: blueprint composable-services-within-roles Depends-On: I1dde63a5a7d1624494a7157a9679f88f4cb780e0
2016-06-12Composable roles within services - MongoDBCarlos Camacho1-0/+1
Add MongoDB as a composable service. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: Idaa3275def3bcdb302a66fc1c88531ff718bcf67 Depends-On: Idb1e78ebec7682fe68ca5902a22cfb6030498091
2016-06-10Merge "composable neutron ml2 and ovs agent"Jenkins5-7/+7
2016-06-10Merge "composable neutron server"Jenkins1-0/+1
2016-06-10Merge "Adjust UpgradeLevelNovaCompute rpc messaging pin to mitaka"Jenkins2-2/+2
2016-06-09composable neutron ml2 and ovs agentDan Prince5-7/+7
Adds new puppet and puppet pacemaker specific services for the Neutron ml2 configuration and the Ovs agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I896e5dfe6fae49371c9fe7f47c4364eb6f621b07
2016-06-09composable neutron serverDan Prince1-0/+1
Adds new puppet and puppet pacemaker specific services for the Neutron server configuration. Depends-On: I52815f45a04bf3e39940b9cb116261730580a3e2 Partially-implements: blueprint composable-services-within-roles Change-Id: I1680d4b7044f16d672e99ca356d954b6734af287
2016-06-06Merge "Explode Loadbalancer role into HAproxy + keepalived"Jenkins1-1/+1
2016-06-06Enable nova-conductor as a composable serviceEmilien Macchi1-0/+1
Implement NovaConductor service using nova-base for common parameters. * Move rabbitmq parameters from controller.yaml to nova-base service, as an example. More parameters will move in the future. * Move nova-conductor bits from monolithic manifests to the new service using new profiles from puppet-tripleo. Depends-On: Iaaf3a3c2528d9747e41f360a1fe55f95ed37b2d1 Implements: blueprint composable-services-within-roles Change-Id: I178f092b74ae12f2cb6f006db7cb00e4d6bddfd8
2016-06-04Explode Loadbalancer role into HAproxy + keepalivedEmilien Macchi1-1/+1
Split Loadbalancer into HAproxy & Keepalived roles. Depends-On: I8aa9045fc80205485abab723968b26084f60bf71 Change-Id: If2723358099e78052c351a4a45fdf01d116a89df
2016-06-04Merge "Composable roles within services - Redis"Jenkins1-0/+1
2016-06-02Switch Cinder Api/Scheduler/Volume to composable rolesGiulio Fidente1-0/+3
Uses a shared cinder-base resource to do the database and messaging configuration for all three services. Depends-On: I3c6d5226eed5f0f852b0ad9476c7cd9a959fda69 Change-Id: I47c5fd190efca5f02e73fd22aba6cda573daf5cc
2016-06-02Composable roles within services - RedisPradeep Kilambi1-0/+1
Co-Authored-By: Carlos Camacho <ccamacho@redhat.com> Change-Id: I0d9332f7f4f9116c5435d338a9c35d4fb3f512c6 Implements: blueprint composable-services-within-roles Depends-On: I60493a3aa64e5136b763e8e2084d728f5f812f8a
2016-05-31Adjust UpgradeLevelNovaCompute rpc messaging pin to mitakamarios2-2/+2
For upgrades to current master newton, we should pin nova compute rpc to the previous/current version, mitaka. Implements: blueprint overcloud-upgrades-workflow-mitaka-to-newton Change-Id: I89c3a8c50e83e682f83aa0d9eb222313676277e6
2016-05-30Pass MysqlVirtualIP via EndpointMapGiulio Fidente1-0/+1
By passing the MysqlVirtualIP via the EndpointMap we won't need it to be provided as a parameter to the services. This follows what is already happening for the glance registry service with I9186e56cd4746a60e65dc5ac12e6595ac56505f0. Change-Id: Iad2ab389bf64d0fc8b06eb0e7d29b5370ff27dff Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
2016-05-26Merge "composable heat services"Jenkins1-0/+4
2016-05-20Adds memcached as a composable servicemarios1-0/+1
Implements: blueprint composable-services-within-roles Depends-On: Icd504aef7dda144582c286c56c925a78566af72c Change-Id: I8802c2a0cf1e5fa1a6d1fab5e87f6014bea2f517
2016-05-19composable heat servicesBrad P. Crochet1-0/+4
Adds new puppet and puppet pacemaker specific services for Heat API, Heat API CFN, Heat API Cloudwatch, and Heat Engine. The Pacemaker templates extend the default heat services and swap in the pacemaker specific puppet-tripleo profile instead. Change-Id: I387b6bfd763d2d86cad68a3119b0edd0caa237b0 Partially-implements: blueprint composable-services-within-roles Depends-On: I194cbb6aa307c2331597147545cf10299cab132f Depends-On: I14dc923ac8ee8d5d538e7f4cf8138ccee8805b53
2016-05-19Deploy Loadbalancer as a composable roleEmilien Macchi1-0/+1
Deploy loadbalancer service using puppet-tripleo, and drop puppet code. Implements: blueprint refactor-puppet-manifests Depends-On: I9b106dcc1a4d446ab5dea8430ed295e6ec209cbd Change-Id: I9ca50a4bc822ec17d89988894af9bdf07e4bd1a9
2016-05-19Merge "add heat-api-cfn to endpoint map"Jenkins1-0/+3
2016-05-18Deploy RabbitMQ as a composable roleEmilien Macchi1-0/+1
Change the way to implement RabbitMQ, as a composable role. Implements: blueprint refactor-puppet-manifests Change-Id: I5fed5c437ad492af75791a9163f99ae292f58895
2016-05-18composable neutron metadata serviceDan Prince4-5/+6
Adds new puppet and puppet pacemaker specific services for the Neutron Metadata agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I25f026507e78f18594599b3621613a54f246545d
2016-05-18composable neutron l3 serviceDan Prince5-6/+7
Adds new puppet and puppet pacemaker specific services for the Neutron L3 agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I0316043efe357a41ef3b4088a55d98dbb6d25963
2016-05-17Move dhcp agent maps to OS::Heat::None to resource_registryJames Slagle2-3/+4
Change Id Ia61295943e67efe354a51a26fe4540f288ff6ede added support for composable Neutron dhcp agent services. However in the sample environments for OpenContrail and Plumgrid where dhcp agent is disabled, the mapping for OS::Heat::None was under parameter_defaults instead of resource_registry. Change-Id: I0aedbbc3720783d4208d524cd28c7eed4fc5d1d7
2016-05-16Remove Nova EC2 deploymentEmilien Macchi1-3/+0
Nova EC2 does not exist anymore since Mitaka, parameters are already deprecated in Mitaka and send warnings to the Puppet catalog. The service has been replaced by ec2api project, where Puppet OpenStack team is currently writting a module. In the meantime we add support in TripleO, this patch removes all occurences of Nova EC2 configuration, which are useless and send warnings for nothing. Change-Id: Ief2d0e5c77b5ac58560606fee930fbd66c40ffc3
2016-05-12add heat-api-cfn to endpoint mapSteven Hardy1-0/+3
Change-Id: I8f98ce92fc387d2263fda738c1c8a209e3cbbb85
2016-05-10composable neutron dhcp serviceDan Prince3-2/+3
Adds new puppet and puppet pacemaker specific services for the Neutron DHCP agent. Depends-On: Ibbfd79421f871e41f870745a593cca65e8c0e58a Partially-implements: blueprint composable-services-within-roles Change-Id: Ia61295943e67efe354a51a26fe4540f288ff6ede
2016-05-06Merge "Document IPv6 syntax for GlanceFilePcmkDevice"Jenkins1-0/+2
2016-05-06Merge "Fixes ovs bonding option"Jenkins1-1/+1
2016-05-06Merge "Additional parameters for Nuage Neutron plugin integration"Jenkins1-0/+9
2016-05-04Merge "Fix distinguishing between stack-create and stack-update"Jenkins1-4/+0
2016-05-03Merge "Updates ControlPlaneSubnetCidr to be a string"Jenkins1-1/+1
2016-04-29Additional parameters for Nuage Neutron plugin integrationDavid Gurtner1-0/+9
Add additional parameters, specifically: * set core plugin to Nuage * disable service plugins * disable OVS, l3, metadata and DHCP agent * rename OVS bridge to alubr0 * include Nuage API extensions Change-Id: Ia0c201fd3b01cd524e096e6f246d707c6e643944
2016-04-28Fixes ovs bonding optionRamon Acedo1-1/+1
Default ovs bonding options parameter BondInterfaceOvsOptions was wrongly set to "mode=active-backup" which makes os-net-config fail. This fix changes it to "bond_mode=active-backup". Change-Id: If3eaac6558c1a15ac09b198f90f05f1a77cf794b Closes-Bug: #1576137
2016-04-21The Sahara SSL endpoint was announced on the wrong portGiulio Fidente1-1/+1
Change-Id: I0cab3cdb2189dab3844f2eda52b8697d05ad3447
2016-04-21composable glance servicesDan Prince1-0/+2
Adds new puppet and puppet pacemaker specific services for Glance API and Glance Registry. The Pacemaker templates extend the default glance services and swap in the pacemaker specific puppet-tripleo profile instead. In the case of pacemaker glance-registry there is no separate puppet manifest so only the configuration parameters are maintained there. (Due to the way the pacemaker glance constraints are written the pacemaker varients of this service can't be split out...) Depends-On: Ifc388f7058ccfff2818f531bcbc00c7179874bbc Change-Id: I00a8c916129af43cda225754eb10370289bb4b41
2016-04-14Add GlanceRegistry to the endpoint mapDan Prince1-0/+1
This patch adds GlanceRegistry to the endpoint map. This will make accessing Glance registry setings via the endpoint map possible. Change-Id: I9186e56cd4746a60e65dc5ac12e6595ac56505f0
2016-04-11Document IPv6 syntax for GlanceFilePcmkDeviceIan Pilcher1-0/+2
Change-Id: I1734a9755c4254221033cf2245ce9da8b2eeb924 Closes-Bug: 1568995
2016-04-11Always use parameter_defaults in environment filesJiri Stransky6-7/+7
In the environments/ subdirectory of tripleo-heat-templates, we mostly use parameter_defaults, but some of the environment files still use parameters. This can lead to confusing behavior with respect to parameter priority when passing environment files to deploy/update commands. Users might expect that subsequent environment files take priority over preceding ones, but that might not be the case if the preceding environment files use `parameters`, while the subsequent ones use `parameter_defaults`. This commit switches all `parameters:` uses in environments/ subdirectory to `parameter_defaults:`. Change-Id: Ie4c03c7e7f5a5004a0384d35817135f357e9719b Closes-Bug: #1567837
2016-04-11Deploy Gnocchi as a Ceilometer metrics storage backendPradeep Kilambi4-2/+10
* Deploy Gnocchi API. * Storage backends: swift, rbd and file. * Indexer backend default to mysql * Configure Ceilometer to send metrics datas to Gnocchi * Pacemaker config Depends-On: Ic8778a3104e0ed0460423e4bf857682220dc5802 Depends-On: I7d2eb9405e0171fc54fa0b616122f69db5f51ce2 Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com> Change-Id: Ifde17b1ab8fa2b30544633e455e1c7eb475705aa
2016-04-11Merge "composable keystone services"Jenkins1-0/+6
2016-04-11Fix distinguishing between stack-create and stack-updateJiri Stransky1-4/+0
Previously we tried to use UpdateIdentifier for two different things: tell whether to perform package update, and also to tell whether the top-level stack is being created or updated (which was incorrect and resulted in bug 1567384, and an attempt to work around that bug resulted in bug 1567385). We cannot use Heat's "action" conditionals in some cases, because they refer to the direct parent stack, which can yield undesirable results when introducing new nested stacks or temporarily no-opping something and then adding it back (in both these cases, "action" would be considered "CREATE", even though the top-level stack is in "UPDATE"). So tripleoclient passes a new parameter StackAction to tell whether the top-level stack is being created or updated, and we make use of that. (It seems there's no better way of getting this info from within the nested Heat stacks.) Change-Id: Ie14ddbff15e7ed21aaa3fcdacf36e0040f912382 Depends-On: I9dc3b4cd8a6a71df34d8babf0e4c6505041f5311 Closes-Bug: #1567384 Related-Bug: #1567385
2016-04-11Don't have separate protocols/ports for Keystone v3Zane Bitter1-3/+0
The change in ab068a824ed51e78bf111387223e58e885ec5c84 is described as temporary, so it would be better if it did not affect the EndpointMap parameter (which is effectively a public interface, since it may be overridden in an environment file). No configuration should end up with different ports/protocols/hosts for Keystone v2 and v3, and somebody customising them should not have to account for them separately. Nor should things break when the need to distinguish between v2 and v3 endpoints goes away. This change removes the KeystoneV3* keys from the EndpointMap input and uses the Keystone* keys instead, so that any change to the internal organisation becomes transparent to the user. Change-Id: If4cdd9232f4dbc9f2af651bbdfe68f09dc26ed2e
2016-04-09composable keystone servicesDan Prince1-0/+6
Adds new puppet and puppet pacemaker specific services for Keystone. The puppet manifests for keystone now live in puppet-tripleo. Hiera settings are driven by the nested stack heat templates and used to control puppet-keystone and puppet-tripleo directly. The Pacemaker template extends the default keystone service and swaps in the pacemaker specific puppet-tripleo profile instead. Change-Id: I8b30438a27e9d5ec4e7d335e0bd1a931a20b03a2 Depends-On: I2faf5a78db802549053ec41678bf83bf28108189
2016-04-08Remove network/noop.yaml, use OS::Heat::NoneDan Prince3-3/+3
Removes the old noop nested stack template for networks and instead uses OS::Heat::None instead. This should avoid a few extra resource checks on create and update. Change-Id: Ia3d7f62dbda2705ffc3d9edcddebcd3ece3cc9d2
2016-03-31Updates ControlPlaneSubnetCidr to be a stringRhys Oxenham1-1/+1
Heat is unable to execute the following join when creating the os-net-config definition (OsNetConfigImpl): addresses: - ip_netmask: list_join: - '/' - - {get_param: ControlPlaneIp} - {get_param: ControlPlaneSubnetCidr} In the default network-environment.yaml environment file the ControlPlaneSubnetCidr is defaulted as a non-string "24", e.g. ControlPlaneSubnetCidr: 24 Resulting in the following error, upon deploymnet: 2016-03-30 22:44:17 [overcloud-Controller-wazxxjc6dq22-2-2ictqfdx2nuo]: CREATE_FAILED Resource CREATE failed: resources.NetworkConfig: Property error: resources.OsNetConfigImpl.properties.config: Items to join must be strings not 24 This patch simply updates the default value to '24', to match other templates. This allows a deployment to succeed as expected. Change-Id: I5f75b02dba5c35a9856c6ceff9cf6c24a0cb56d8
2016-03-29Merge "PLUMgrid Neutron integration"Jenkins1-0/+29
2016-03-24Set UpdateIdentifier for upgrade converge, to prevent services downMathieu Bultel1-0/+4
We'd like to let the post puppet pacemaker controller services restart to happen for the convergence step so set the UpdateIdentifier. However also set the PackageUpdate to noop so the yum_update.sh doesn't happen. Since a full haproxy restart is expected, we no longer need the systemctl reload added at Iae3bad745ecdf952a7a0314fe1375d07eb47c454 so remove that too. Some more context at https://bugzilla.redhat.com/show_bug.cgi?id=1321036 Co-Authored-By: marios <marios@redhat.com> Change-Id: I31c2d97d68c97b435f63863fae2c89f18f99681d
2016-03-24Merge "Deploy Aodh services, replacing Ceilometer Alarm"Jenkins1-0/+3