summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-11Merge "Move heat::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move cinder::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move glance::db data within service template"Jenkins2-8/+7
2016-07-11Merge "Move keystone::db data within service template"Jenkins2-8/+7
2016-07-11Merge "Pass MysqlVirtualIP without brackets to EndpointMap"Jenkins3-0/+48
2016-07-11Merge "Set os-refresh-config timeout to 4 hours"Jenkins5-5/+5
2016-07-11Merge "Template param for what command occ runs"Jenkins5-0/+35
2016-07-09Move heat::db data within service templateGiulio Fidente2-8/+6
Change-Id: I3fada6c5b0265bc6536c89da0ef4b709ead13b7d
2016-07-09Move cinder::db data within service templateGiulio Fidente2-8/+6
Change-Id: I2aaf30289cc792e8860ca9c962d80baf7e804cbf
2016-07-09Move glance::db data within service templateGiulio Fidente2-8/+7
Change-Id: I405bc9895160cc867f933e6b0d56546d460d2e3a
2016-07-08Composable Midonet for NeutronDan Prince7-160/+80
Depends-On: I2393fc3c360f5f5786411f64dbcd06f380376093 Change-Id: I606cb1f7ef7d651b5d145bfa10ef3aa1561b1590 Partially-implements: blueprint composable-services-within-roles
2016-07-08Move keystone::db data within service templateGiulio Fidente2-8/+7
Change-Id: I934aff4960588a3957b7a7bcc90385ae48d34d1e
2016-07-08Pass MysqlVirtualIP without brackets to EndpointMapGiulio Fidente3-0/+48
While the endpoints do need brackets around IPv6 addresses these are not wanted by some of the puppet classes so we must pass the non bracketed version as well. It will allow us to remove the need for the MysqlVirtualIP param passed to the controller role thouh when hieradata/database.yaml is emptied. Change-Id: If264b02a134b96368035f032e05d02e84f6499ed
2016-07-08Add StepConfig to docker compute-post.yamlFlavio Percoco1-1/+10
Change I84c97a76159704c2d6c963bc4b26e365764b1366 missed `docker/compute-post.yaml`. Change-Id: I680eabf2f316c7fccc9d53d75dc16139c9959c64
2016-07-08Merge "Parametrize and increase default of swift-proxy node_timeout"Jenkins1-0/+5
2016-07-07Merge pacemaker_master/sync_db conditionalsGiulio Fidente1-40/+38
By condensing the pacemaker_master and sync_db conditions we ensure there won't be unrelevant (clustercheck) execs deployed on non-bootstrap nodes. Closes-Bug: 1598907 Change-Id: Iae6aa13682d63096265f4751b2f71019a49f6fa6
2016-07-07Merge "Convert AllNodesExtraConfig to OS::Heat::None"Jenkins2-26/+2
2016-07-07Merge "Remove config_identifier from all_nodes extraconfig examples"Jenkins7-42/+3
2016-07-07Merge "Restore the NtpServer parameter name"Jenkins1-3/+3
2016-07-06Merge "Add kernel service"Jenkins9-38/+24
2016-07-06Merge "Allow neutron_options customization for dashboard"Jenkins2-2/+2
2016-07-06Restore the NtpServer parameter nameDan Prince1-3/+3
In 296bffde893dbbf36c62d664e24e2584b89b8070 we moved the NTP into a composable service but changed the name of the parameter to NtpServers. This will break upgrades for users of the previous parameter name. Closes-bug: #1599526 Change-Id: I896b9427416f01b603ac9cc4d8c9ebf5e019cb32
2016-07-05Merge "Split Heat pacemaker roles into separate services"Jenkins4-13/+7
2016-07-05Merge "pacemaker: don't override Service resource for Nova & Neutron"Jenkins1-3/+1
2016-07-05Convert AllNodesExtraConfig to OS::Heat::NoneSteven Hardy2-26/+2
Instead of creating a nested stack, as it's slightly lower overhead and will make things easier when adding custom roles (where a hard-coded default template can't work) Change-Id: If9f8294ba477d1c1364e19a52152905a2c02e959
2016-07-05Remove config_identifier from all_nodes extraconfig examplesSteven Hardy7-42/+3
Since https://review.openstack.org/#/c/315616 this is no longer required. Change-Id: I0452d1577a25d19b4351bfe7830a6c7bbe485e67
2016-07-05Merge "Use create-legacy-resource-types during gnocchi-upgrade"Jenkins1-1/+1
2016-07-05Merge "overcloud_volume: cleanup unused Puppet code"Jenkins1-22/+0
2016-07-05Merge "volume: deploy snmp using composable role"Jenkins2-10/+1
2016-07-05Add kernel serviceEmilien Macchi9-38/+24
Add a new service that will load and configure kernel modules. Depends-On: If4f1047ff8c193a14b821d8b826f637872cf62bd Change-Id: I8f771712595d0f4826858b855985f65d3621c3f1
2016-07-05Merge "Replace NodeConfigIdentifiers with DeployIdentifier"Jenkins12-103/+39
2016-07-05Set os-refresh-config timeout to 4 hoursSteve Baker5-5/+5
This change uses the new os-refresh-config --timeout argument to set a kill timeout for stalled os-refresh-config runs. 4 hours is a reasonable conservative value since it matches the stack timeout - but it can be set shorter in the future based on actual run times. Change-Id: I433f558515df24736263ec0d50de08ad8f78498f Closes-Bug: #1595722 DependsOn: Ibcbb2090aed126abec8dac49efa53ecbdb2b9b2c
2016-07-05Template param for what command occ runsSteve Baker5-0/+35
The ConfigCommand parameter overrides the server resource metadata to specify what command os-collect-config runs whenever any configuration data changes. The default is already 'os-refresh-config' so this change has no effect but it allows a future change to specify an os-refresh-config --timeout argument to fix bug #1595722. Change-Id: I8dd35b6724d8c00e5495faca84ee8fee77641b82 Partial-Bug: #1595722
2016-07-04Remove depends_on: Networks from ControllerServiceChainSteven Hardy1-1/+0
I think this depends_on is bogus - the Controller ResourceGroup does depend on Networks, but not the ControllerServiceChain - this needs to be consistent with the other ServiceChain definitions for the custom-roles work. Change-Id: I0159968719f5d21c8f216ad69af047fa141d54e9
2016-07-04Replace NodeConfigIdentifiers with DeployIdentifierSteven Hardy12-103/+39
We added NodeConfigIdentifiers to trigger config to be re-applied on update, but then later added DeployIdentifier which forces config to *always* be applied on update, so we can simplify things by just referencing the DeployIdentifier directly. Change-Id: I79212def1936740825b714419dcb4952bc586a39
2016-07-04overcloud_volume: cleanup unused Puppet codeEmilien Macchi1-22/+0
overcloud_volume contains some code that is already deployed by OS::TripleO::Services::CinderVolume service. Change-Id: I3446883cb89dcf179a854e2adef81b899117f66a
2016-07-04volume: deploy snmp using composable roleEmilien Macchi2-10/+1
Change-Id: Ibc9abf7043c37104d03cd72d882e10cdb53fe6a2
2016-07-04Switch Ceph Monitor/OSD/Client/External to composable rolesGiulio Fidente21-431/+323
Change-Id: I1921115cb6218c7554348636c404245c79937673 Depends-On: I7ac096feb9f5655003becd79d2eea355a047c90b Depends-On: I871ef420700e6d0ee5c1e444e019d58b3a9a45a6
2016-07-04Merge "Add example of creating per-node os-net-config mappings"Jenkins1-0/+65
2016-07-04Merge "Remove NFS bits from overcloud_compute manifest"Jenkins1-12/+0
2016-07-04pacemaker: don't override Service resource for Nova & NeutronEmilien Macchi1-3/+1
Nova & Neutron services are already managed by puppet-tripleo in profiles, and we already override Service resource for some services to manage them with Pacemaker. Dropping this code here will allow us to run TripleO in AIO setup as we don't manage everything with Pacemaker. Change-Id: Idcfc6ea26ca41534ce407be0eb3dafe7bcd2ef2d
2016-07-04Merge "Dump and restore galera db during major upgrades"Jenkins3-0/+184
2016-07-04Merge "Don't set selinux in 'permissive' mode on CephStorage nodes"Jenkins1-2/+0
2016-07-04Merge "Add Rabbit/epmd port to firewall"Jenkins1-0/+1
2016-07-04Merge "Stop no-opping PackageUpdate on upgrade"Jenkins2-2/+0
2016-07-01Remove NFS bits from overcloud_compute manifestEmilien Macchi1-12/+0
They moved to puppet-tripleo. Change-Id: Idd4488fc4b1e8e8024d47f6e3d83ac4f3cecd088 Depends-On: I75d68cc766ad274b16b22f43b7d34d02ab26de13
2016-07-01Merge "First iteration of libvirt and nova-compute as a composable services"Jenkins7-43/+50
2016-07-01Add example of creating per-node os-net-config mappingsSteven Hardy1-0/+65
Adds an example of proving a mapping file for all nodes, then extracting the data for each node based on a lookup of the mac address. Some assumptions are made (e.g the hard-coded reference to eth0), but it should be easily modified to suit specific environments. Usage via an enviroment file will look like: resource_registry: OS::TripleO::NodeUserData: os-net-config-mappings.yaml parameter_defaults: NetConfigDataLookup: host1: nic1: "00:c8:7c:e6:f0:2e" host2: nic1: "00:18:7d:99:0c:b6" Note this version requires liberty heat in the undercloud due to the use of a new str_replace feature to serialize the json parameter. Change-Id: I7da9c9d8805e676a383e888a7d77f05d3432ab12
2016-07-01Stop no-opping PackageUpdate on upgradeJiri Stransky2-2/+0
After we fixed bug #1567384 and bug #1567385, we no longer need to no-op the PakageUpdate resource on upgrades. I removed the no-op in change Ie14ddbff15e7ed21aaa3fcdacf36e0040f912382 from major-upgrade-pacemaker-converge.yaml but didn't recall we had the no-op in major-upgrade-pacemaker{,-init}.yaml too. Change-Id: I24b913c790eae79e3b207729e0b22378075fb282
2016-07-01Pass RoleData into -post.yaml stacksDan Prince6-39/+33
This patch modifies the interface for the -post stacks so that we pass RoleData instead of just the StepConfig into each -post.yaml template. This will facilitate creating other types of -post.yaml scripts that require more data that just 'step_config'. Things like containers, etc. will require this. Change-Id: I2527fc0098192f092f5e9046033a04bc71be2cae