summaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2017-07-18Merge "Corrected wrong os_region_name in glance-api conf file"Jenkins1-0/+1
2017-07-18Merge "Handles {controller,NovaCompute}ExtraConfig deprecation in ovecloud.j2"Jenkins1-27/+26
2017-07-17Handles {controller,NovaCompute}ExtraConfig deprecation in ovecloud.j2Giulio Fidente1-27/+26
We missed to parse and merge {controller,NovaCompute}ExtraConfig data in change [1]. Also fixes whitespaces handling in docker-steps.j2 and puppet-steps.j2 previously updated by [2]. 1. Id37de5864138edd5476c097a8a1f0763faeaf768 2. I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a Change-Id: Ia9983bc991eb79e479855993c1c8819ddfb52e38
2017-07-17Merge "Add role_merged_configs into workflow executions environmentxi"Jenkins1-0/+8
2017-07-14Merge "Adds network/cidr mapping into a new service property"Jenkins184-0/+851
2017-07-14Merge "Support deprecated controllerExtraConfig naming in role template"Jenkins1-1/+27
2017-07-14Add role_merged_configs into workflow executions environmentxiGiulio Fidente1-0/+8
Merges per-role config settings into merged_config_settings which is wired into the workflow executions environment. Useful to consume role config settings from within a workflow. Change-Id: Id37de5864138edd5476c097a8a1f0763faeaf768
2017-07-14Merge "Disable systemd-networkd & systemd-resolved"Jenkins2-0/+8
2017-07-14Adds network/cidr mapping into a new service propertyGiulio Fidente184-0/+851
Makes it possible to resolve network subnets within a service template; the data is transported into a new property ServiceData wired into every service which hopefully is generic enough to be extended in the future and transport more data. Data can be consumed in service templates to set config values which need to know what is the subnet where a deamon operates (for example the Ceph Public vs Cluster network). Change-Id: I28e21c46f1ef609517175f7e7ee19e28d1c0cba2
2017-07-14Disable systemd-networkd & systemd-resolvedEmilien Macchi2-0/+8
Latest commits in puppet-systemd enabled by default systemd-networkd and systemd-resolved but we don't want to manage them for now in TripleO. MySQL and MongoDB services were managing some systemd resources so now we ensure that these 2 systemd services are disabled. In the future, we might want and activate these services and revert that patch but for now we want to disable them. Change-Id: I42c6c9b643a71a0fbb1768bbae91e8bfa916ea00 Closes-Bug: #1704145
2017-07-13Support deprecated controllerExtraConfig naming in role templateSteven Hardy1-1/+27
To enable backwards compatibility with rendering the controler-role template add this deprecated parameter for all roles - we should remove this in a future release after the tripleoclient warnings re deprecated parameters are available. Change-Id: Icce93a4109191609848ca216c946a32663753b93
2017-07-13Remove special-case of memcache node ips for ipv6Steven Hardy1-7/+0
This should be handled in puppet-tripleo, as is done for some other services e.g ceph. This has also been identified as a possible performance problem due to the nested get_attr calls. Change-Id: I7e14f0219c28c023c4e8e1d4693f0bfa9674d801 Related-Bug: #1684272 Depends-On: Iccb9089db4b382db3adb9340f18f6d2364ca7f58
2017-07-13Merge "Remove hardcoded enable_load_balancer from Controller role"Jenkins2-7/+5
2017-07-13Merge "Make NeutronEnableDVR parameter consistent"Jenkins1-2/+1
2017-07-13Merge "Make Rabbit parameters consistent"Jenkins1-3/+3
2017-07-13Merge "Make CephValidationDelay/Retries default consistent"Jenkins1-2/+2
2017-07-13Corrected wrong os_region_name in glance-api conf filePranaliD1-0/+1
KeystoneRegion value for all endpoints is set as 'regionOne', it should be same in the configuration file. In case of Cinder as glance backend the os_region_name should be "regionOne" instead of "RegionOne". Currently CI is not failing because cinder backend scenario is not yet added. But this would definitely fail if os_region_name=RegionOne. Change-Id: I26811a404a20ea3c55f5b272f86d9269d0f6acec Closes-Bug: 1704060
2017-07-13Merge "Revert "Revert "Blacklist support for ExtraConfig"""Jenkins6-0/+96
2017-07-13Merge "Allow to set Notification Driver to 'noop'"Jenkins15-3/+106
2017-07-13Merge "Add DeployedServerEnvironmentOutput"Jenkins6-0/+234
2017-07-12Merge "Remove controller specific bootstack_nodeid"Jenkins1-4/+0
2017-07-12Merge "Remove ceilometer apache files on upgrade"Jenkins1-0/+41
2017-07-11Allow to set Notification Driver to 'noop'Emilien Macchi15-3/+106
This patch does 2 things: * Configure messagingv2 as default driver for Oslo Notifications sent on RPC. * Allow users to choose between messagingv2 (default) and noop when we want to disable notifications (for example, when Telemetry is disabled). * Deprecate KeystoneNotificationDriver in favor of NotificationDriver. Change-Id: Ia547d7f4bfb51e7c45246b097b48fd86da231bd3 Related-Bug: #1701357
2017-07-11Remove hardcoded enable_load_balancer from Controller roleSteven Hardy2-7/+5
This is associated with the haproxy service, so set the hieradata there instead. This is needed so we can render the controller role template via j2, and also if anyone ever wants to run haproxy on some role other then the Controller. Change-Id: I82b992afe42f6da7788f6efca2366863c3bf68f7 Partially-Implements: blueprint composable-networks
2017-07-11Remove controller specific bootstack_nodeidSteven Hardy1-4/+0
This has been replaced for some time by bootstrap_nodeid which isn't hard-coded to the Controller role. Change-Id: I2c172de13646e5b88cb9930a93ca71fcc990e522 Depends-On: I0a9fced847caf344e5d26b452f1bd40afab8f029
2017-07-10Revert "Revert "Blacklist support for ExtraConfig""James Slagle6-0/+96
There is a Heat patch posted (via Depends-On) that resolves the issue that caused this to be reverted. This reverts the revert and we need to make sure all the upgrades jobs pass before we merge this patch. This reverts commit 69936229f4def703cd44ab164d8d1989c9fa37cb. Closes-Bug: #1699463 implements blueprint disable-deployments Change-Id: Iedf680fddfbfc020d301bec8837a0cb98d481eb5
2017-07-10Add DeployedServerEnvironmentOutputJames Slagle6-0/+234
Add a new output, DeployedServerEnvionmentOutput, that can be used as the contents of an environment file to input into a services only stack when using split-stack. The parameter simplifies the manual steps needed to deploy split-stack. By default, the resource that generates the output is mapped to OS::Heat::None. implements blueprint split-stack-default Change-Id: I6004cd3f56778f078a69a20e93a0eba0c574b3db
2017-07-10Merge "Modify generic role template to support custom networks"Jenkins1-121/+34
2017-07-07Remove ceilometer apache files on upgradePradeep Kilambi1-0/+41
Ceilometer API runs under apache. Since this service is deprecated and disabled in pike, we need to ensure the apache files are removed during upgrade. Change-Id: I0c0913e74396bd463f5a6da46f83512bab77b75e
2017-07-06Merge "Enable Neutron LBaaS Integration"Jenkins1-0/+70
2017-07-05Modify generic role template to support custom networksSteven Hardy1-121/+34
Render all per-network resources and interfaces via j2 to enable future support for custom networks via network_data.yaml Note this doesn't enable custom networks for the built-in roles as we skip j2 rendering for them, this will be resolved by converting them to use the generic role template instead of the hard-coded ones listed in the j2_excludes.yaml. Depends-On: I18fa3829ff38ac200550d8e36bbe334c0005da22 Change-Id: I49565f9389f3ec9aef4861e23a3bed64a85501e6 Partially-Implements: blueprint composable-networks
2017-07-05Merge "Update NovaCompute to consume CephClientKey"Jenkins1-6/+9
2017-07-04Enable Neutron LBaaS IntegrationRyan Hefner1-0/+70
Allows the configuration of the Neutron LBaaS agent. Implements: blueprint lbaasv2-service-integration Change-Id: Iae2bf7faeea93d5275994b2ee10f9bf863ed6152 Depends-On: Ieeb21fafd340fdfbaddbe7633946fe0f05c640c9
2017-07-04Convert role templates to consume roles_data mapSteven Hardy1-94/+94
Currently we only consume the name with a special-case for the disable constraints boolean, but it will be more flexible if we consume the whole roles_data mapping for each role, so that e.g composable networks and other per-role customizations can be expressed in these templates Partially-Implements: blueprint composable-networks Depends-On: Id1249b78b3dd87e91d572ffa31b7a541f3cde2c7 Change-Id: I355534ec456479944f66106e957404a660d8f2d2
2017-07-04Merge "Make ceilometer crontab removal idempotent"Jenkins1-0/+3
2017-07-03Update NovaCompute to consume CephClientKeyKeith Schincke1-6/+9
It is not necessary to get the Ceph key issueing a get-key to the Ceph cluster; this change provides the libvirt key via parameter instead. Change-Id: Iff3dbcb0f1b4d2373570e184e636a71553cea708
2017-07-02Merge "Move glance::api::show_multiple_locations within GlanceApi"Jenkins3-48/+13
2017-06-30Merge "Re-enable default for RoleParameters"Jenkins5-0/+5
2017-06-30Merge "Make NovaWorkers descriptions consistent"Jenkins4-4/+4
2017-06-29Add stack_name/ctlplane_service_ips into post-upgrade.j2.yamlSteven Hardy1-2/+5
Upgrades are broken because this was missed from I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a and Ia619ab935c66081769e69c53d1ca41925d86abbb Change-Id: I96590e2219df64b94dfecd91d5e25231fc7e514b Related-Bug: #1700755
2017-06-29Make ceilometer crontab removal idempotentJiri Stransky1-0/+3
When we re-execute an upgrade and the crontab has already been removed, the crontab removal returns 1, saying "no crontab for ceilometer", and the upgrade fails. This change makes the removal idempotent. Change-Id: Ic955fb67bb2f7afde44291f7db3293c88f167566 Closes-Bug: #1701250
2017-06-29Merge "Enable nova-api to run over httpd again"Jenkins1-112/+108
2017-06-28Merge "Disable swift middleware ceilometer pipeline by default"Jenkins1-12/+17
2017-06-28Make NeutronEnableDVR parameter consistentBen Nemec1-2/+1
Change-Id: I4bc74ccfa9bd143b203dd9ad97dacddf56949727 Partial-Bug: 1700664
2017-06-28Make Rabbit parameters consistentBen Nemec1-3/+3
The Qdr service appears to have hijacked these parameters for its own use. I don't think it should have done that in the first place, but at least the parameter descriptions need to be kept consistent with the other services. Partial-Bug: 1700664 Change-Id: I6d9a075a99f33e9deacaf5b10a6ea7b0a234b942
2017-06-28Make CephValidationDelay/Retries default consistentBen Nemec1-2/+2
Also fix one instance of ManagementIpSubnet that was missing a description. Change-Id: I7c5b31d9ef464cefee1dd6ae7ebb9c017cbbd894 Partial-Bug: 1700664
2017-06-28Enable nova-api to run over httpd againJuan Antonio Osorio Robles1-112/+108
This is needed for TLS everywhere. Change-Id: Iac35b7ddcd8a800901548c75ca8d5083ad17e4d3 Depends-On: I426bfdb9e6c852eb32d10a12e521bb8b47701c41
2017-06-28Disable swift middleware ceilometer pipeline by defaultPradeep Kilambi1-12/+17
This generates tons of unnecessary events when gnocchi uses swift backend. We end up filtering most of these anyway. So lets disable this so it doesn't put useless load. Also changing the default project to service as thats what gnocchi uses to authenticate with swift. Closes-bug: #1693339 Change-Id: I40f47d46fdb06f31a739b590bf653bca71e33f61
2017-06-28Add ctlplane_service_ips param to upgrade stepsJiri Stransky1-1/+3
Upgrades were broken because of this missing parameter. Change-Id: Ia88a9833ab8aa26ccc40ee235b8554c9a7fbd22d Closes-Bug: #1700923
2017-06-27Merge "Allow stack_name into major_upgrade_steps.yaml"Jenkins1-1/+4