summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
AgeCommit message (Collapse)AuthorFilesLines
2015-12-17Merge "pacemaker: run neutron-server-start-wait-stop only at step 4"Jenkins1-9/+26
2015-12-15Wire Neutron ML2 plugin and OVS agent settings as arraysGiulio Fidente3-40/+20
Wires the following as arrays to the neutron module: - mechanism_drivers - flat_networks - tenant_network_types - tunnel_types - bridge_mappings Also updates the template version to use a Liberty feature which allows serialization of comma_delimited_list into JSON. Tidies up the manifests by removing the class declarations since config is passed by the puppet/controller+compute hiera mapped_data. Change-Id: Ie9f85fb827099f897ef750e267bc3ed3a864fe59 Co-Authored-By: Steven Hardy <shardy@redhat.com>
2015-12-14Set swift replicas = min(device_count, replicas)Dan Prince1-1/+1
Per Swift upstream commit: 7035639dfd239b52d4ed46aae50f78d16ec8cbfe Swift's ringbuilder now validates that the number of devices is greater than or equal to the replicas. Change-Id: I56eaa9ddda138e87f7615d3bde797b568fa5e302 Related-bug: #1525356
2015-12-10pacemaker: run neutron-server-start-wait-stop only at step 4Emilien Macchi1-9/+26
neutron-server-start-wait-stop is a dangerous Exec that is exposed to race conditions, because it does not have "onlyif" or "unless" statements. That means during a deployment, this exec can be run in the wrong order during Step 5 and/or 6, while it was supposed to be run at Step 4 only. If that happens, the exec will fail because puppet tries to start neutron-server while Pacemaker already started the resource. So in that case, systemd would returns 1 to Puppet which would return 6 to the overcloud deployment and the deployment would fail to finish correctly. This patch aims to prevent from this scenario by making sure we run the exec only during the step 4. Also, in order to secure it a bit more, we add 'unless' statement to this exec, so we would make sure the Puppet run would be idempotent and the Exec would run one successful time only. https://bugzilla.redhat.com/show_bug.cgi?id=1290582 Change-Id: I42813c5cff6c525c15c9c24baad4e355f88af672
2015-12-08Merge "Remove Ceilometer Alarm from the overcloud"Jenkins2-64/+0
2015-12-07Remove Ceilometer Alarm from the overcloudJohn Trowbridge2-64/+0
The Ceilometer alarm service is no longer available in Mitaka. It is replaced by Aodh. Aodh support is added in a follow-up to this patch. Partial-Bug: 1521922 Change-Id: I5babaab7029eaaccf3cc6f194b6c062fd62372cf Backport: none
2015-12-07Merge "Fix the wrong selinux context when glance uses nfs backend"Jenkins1-1/+2
2015-12-02Merge "Make enabling of controller services configurable."Jenkins1-127/+155
2015-11-30Changes for configuring NuageRohit Pagedar1-0/+7
Added ExtraConfig templates and environment files for Nuage Networks specific parameters. Modified overcloud_compute.pp to conditionally include nuage-metadata-agent. Change-Id: I28106d8e26ad4d0158fe5e3a13f2f7b21e5c0b28
2015-11-30Changes for configuring NuageLokesh Jain2-61/+77
Added ExtraConfig templates and environment files for Nuage specific parameters. Modified overcloud_compute.pp and overcloud_controller.pp to conditionally include Nuage plugin and agents. Change-Id: I95510c753b0a262c73566481f9e94279970f4a4f
2015-11-26Merge "Make load balancer deployment optional via template param"Jenkins2-144/+156
2015-11-25Make enabling of controller services configurable.vinayrao1231-127/+155
Following parameters will be user configurable: 1. enable_dhcp_agent 2. enable_metadta_agent 3. enable_l3_agent 4. enable_ovs_agent This change was made as the Nuage plugin does not require these services to come up as a part of the installation. Now, a user can explicitly disable these services using a heat template. Change-Id: Ic132ecbb2e81a3746f304da1cecdc66d0342db72
2015-11-24Make load balancer deployment optional via template paramGiulio Fidente2-144/+156
Adds control over the load balancer deployment via template param. Change-Id: I5625083ff323a87712a5fd3f9a64dd66d2838468
2015-11-19Implement Advanced Firewalling supportEmilien Macchi6-0/+6
Consume puppet-tripleo to create/manage IPtables from Heat templates. This review put in place the logic to enable and setup firewall rules. A known set of rules are applied. More to come. Change-Id: Ib79c23fb27fe3fc03bf223e6922d896cb33dad22 Co-Authored-By: Yanis Guenane <yguenane@redhat.com> Depends-On: I144c60db2a568a94dce5b51257f1d10980173325
2015-11-17Merge "neutron: enable nova-event-callback by default"Jenkins2-0/+2
2015-11-17Merge "Pass ceph::pool arguments when calling class"Jenkins2-8/+4
2015-11-17neutron: enable nova-event-callback by defaultEmilien Macchi2-0/+2
* Add NovaApiVirtualIP string parameter. * Compute nova_url and nova_admin_auth_url parameters. * Configure in Hiera neutron::server::notifications::* parameters. * non-ha: include ::neutron::server::notifications * ha: include ::neutron::server::notifications and create orchestration * Set vif_plugging_is_fatal to True so we actually fail if Neutron is not able to create the VIF during Nova server creation workflow. Depends-On: I21dc10396e92906eab4651c318aa2ee62a8e03c7 Change-Id: I02e41f87404e0030d488476680af2f6d45af94ff
2015-11-16Merge "Bump further the stop/start timeout for pcmk/systemd services"Jenkins1-8/+8
2015-11-13Pass ceph::pool arguments when calling classGiulio Fidente2-8/+4
Pass the ceph::pool properties as arguments to the class call instead of setting them as class defaults. Ceph recommends max 32 PGs and min 4 PGs per OSD so this change also lowers the defaults to 32 which works with 1 OSD, suits well a scenario with 3 OSDs and is easy to customize in the static hiera if more than 8 OSDs are deployed. More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1252546 Change-Id: Ifed11d1857900b2251dfdf69d6b6f168150e6330
2015-11-13Fix cinder error when CinderNfsMountOptions option is absentPierre Blanc2-2/+2
When I deploy director with NFS backend for cinder, sometimes I don't need nfs mount options. If I choose to omit this option, or if the option is defined to '', the deployment fails. This patch add just a default value for this option. Change-Id: Idf708aaecebd5c6db14f48ad2a53d6c2453be5ee Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1281870
2015-11-13Bump further the stop/start timeout for pcmk/systemd servicesGiulio Fidente1-8/+8
This bumps further up the stop/start timeout for the pcmk/systemd services so that it matches the 100s default set in future pcmk versions [1]. 1. https://github.com/ClusterLabs/pacemaker/commit/17d65e9f44061a4fa14a9cddd6edc403b2d6d2b3 Change-Id: I6fc18f1ad876c5a25723710a3b20d8ec9519dcba
2015-11-12Merge "Set default start/stop timeout for pcmk services to 95s"Jenkins1-8/+8
2015-11-11Merge "Allow customization of Ceph client user"Jenkins3-3/+4
2015-11-11Merge "Revert "Manage keystone initialization directly in t-h-t manifests""Jenkins2-30/+0
2015-11-10Merge "Allow customization of the Ceph pool names"Jenkins2-4/+4
2015-11-10Set default start/stop timeout for pcmk services to 95sGiulio Fidente1-8/+8
This change will increase the default start/stop timeout for all the non-ocf pcmk services to 95s to make sure it allows for at least 90s to the systemd script to complete the start/stop. More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1275324 Change-Id: I04f691396a4118b456728a43d71d32ac9a556431
2015-11-09Fix the wrong selinux context when glance uses nfs backendPierre Blanc1-1/+2
We updated the pacemaker resource configuration of fs-varlibglanceimages-clone to mount nfs directory with a specified context. Details on : https://bugzilla.redhat.com/show_bug.cgi?id=1237150 Change-Id: Ia0dd471858f470ae3e82d25151ebe65b8cdbec4f
2015-11-05Allow customization of Ceph client userGiulio Fidente3-3/+4
Previously we enforced the Ceph user used by the OpenStack clients to be named 'openstack', this change allows for customization of such a name. Change-Id: Idef3e1ed4e8e21b645081869b8d6fad2329bdc60
2015-11-05Allow customization of the Ceph pool namesGiulio Fidente2-4/+4
This is useful in those scenarios were we want to use an external Ceph deployment with multiple overclouds. Change-Id: I1749d2a6547f6ce25843709e46a1447e8d42cfff
2015-11-05Make puppet manifests compliant with Puppet 4.xGael Chamoulaud7-363/+366
- https://docs.puppetlabs.com/puppet/3.8/reference/deprecated_language.html - Temporary disablement of the pupppet-lint autoload layout check failing for ringbuilder.pp. A fix for that will be part of an other patch. Change-Id: I495825641ab12e7c5789c1405649c356c5bb8051 Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
2015-11-05Merge "Fix dependency for Ceilometer agent when using MySQL"Jenkins1-8/+17
2015-11-04Merge "Do not enforce start timeout to 90s for neutron-server"Jenkins1-1/+0
2015-11-04Revert "Manage keystone initialization directly in t-h-t manifests"Ben Nemec2-30/+0
This reverts commit 86d6c1ddc76bad423194e789ffb5474e4e12960e. This likely has an impact on upgrades, and since we don't have an upgrade CI job yet I'm concerned that we may have just broken ourselves. I would prefer to wait to merge this until the CI job is in place. Change-Id: Ib2366cb4b40471a28122f6e9955da9bdb31a53fb
2015-11-04Do not enforce start timeout to 90s for neutron-serverGiulio Fidente1-1/+0
The same timeout value is set for every pcmk service in [1] 1. https://github.com/openstack/tripleo-heat-templates/blob/master/puppet/manifests/overcloud_controller_pacemaker.pp#L81 Change-Id: I253f6cbc5ccdbf8c46cc537ff9600f201aae540a
2015-11-03Manage keystone initialization directly in t-h-t manifestsYanis Guenane2-0/+30
This is the second change of a servies of two, it creates the user, user_role, service and endpoint for: * glance * nova * neutron * cinder * horizon * swift * ceilometer * heat Change-Id: I50e792d98a2ba516ff498c58ad402f463c5f7e76
2015-11-03Create keystone roles and admin user from t-h-t manifestsYanis Guenane2-1/+22
Currently keystone initialization happens via os-cloud-config [1]. This commit moves some of that directly into the manifests. This is the first in a series of two changes to migrate it entirely into t-h-t. This change focus on implementing what keystone.initialize() was doing on the tripleoclient [2], creates the admin tenant, user and roles. It also creates the keystone endpoint itself. 1. https://github.com/openstack/os-cloud-config/blob/master/os_cloud_config/keystone.py#L128-L158 2. https://github.com/openstack/python-tripleoclient/blob/master/tripleoclient/v1/overcloud_deploy.py#L462-L527 Change-Id: I98555b707ff9b91c6e218de5dca68106ea05c8ea Depends-On: Ia4b3244f114dcff746ab89d355ad4933f8fdbddf
2015-11-03Fix dependency for Ceilometer agent when using MySQLJuan Antonio Osorio Robles1-8/+17
In HA, when using MySQL as a backend for Ceilometer, the dependencies set for the Ceilometer central agent depended always on MongoDB; Which should only be the case if MongoDB is set as a backend. Change-Id: I6fecfe0564b13e9352313c5a3492505b44d12eaa
2015-11-02Merge "Ensure memcached resource uses interleave=true"Jenkins1-1/+1
2015-11-02Merge "Support NFS backend for Glance (via Pacemaker)"Jenkins1-0/+10
2015-10-21Merge "Sync httpd vhost settings in between pcmk and non-pcmk scenarios"Jenkins2-8/+0
2015-10-19Support NFS backend for Glance (via Pacemaker)Jiri Stransky1-0/+10
Adds support for NFS backend in Glance by allowing the storage directory for the 'file' backend to be a mount managed by Pacemaker. Default behavior is unchanged. Since the Pacemaker-related parameters are not exposed on top level, change storage-environment.yaml to use parameter_defaults instead of parameters. Depends on a Heat fix for environment file's parameter_defaults to work well with JSONs and comma delimited lists (see Depends-On). Change-Id: I6e7e2eaf6919b955650c0b32e1629a4067602c89 Depends-On: I85b13a79dbc97a77e20c0d5df8eaf05b3000815e
2015-10-19Ensure memcached resource uses interleave=trueGiulio Fidente1-1/+1
Without interleave Pacemaker will consider memcached as a single unit on all nodes so it will restart dependencies on every node in case of failures. More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1262425 Change-Id: I284cbf33c8453a2abefc862f3d2e0b7f11ff4c3d
2015-10-15Sync httpd vhost settings in between pcmk and non-pcmk scenariosGiulio Fidente2-8/+0
Moves the vhost_params out of the manifest and into static hiera; also removes unneeded server_alias parameter as that matched the vhost servername anyway. Change-Id: I4b5971b23ef3be9529a59075fa93ccc64af75b9c
2015-10-12Puppet / Compute: allow to run Ephemeral only storage with RBDEmilien Macchi1-2/+3
This patch allows the case where we're not running Ceph to host Persistent storage (volumes) but just to host Ephemeral storage (VMs). Before we were only allowing Ephemeral storage on Ceph when also Persistent storage was using Ceph. Change-Id: I03b775326e4424de413452f4453d4d88de0083bc
2015-10-12Merge "Ensure httpd is not enabled by puppet on system boot"Jenkins1-1/+4
2015-10-09Ensure httpd is not enabled by puppet on system bootGiulio Fidente1-1/+4
The httpd daemon will be started and managed by Pacemaker, it should not be enabled by puppet. Ideally, it shouldn't be started either but it seems it isn't possible with horizon and apache mod_wsgi [1]. 1. https://bugzilla.redhat.com/show_bug.cgi?id=1247547 Change-Id: I8a1b23c4ea27ac86385314f6cfde8c49d0879969 Co-Authored-By: marios andreou (marios@redhat.com)
2015-10-09Merge "Fix MariaDB account removal race condition"Jenkins2-7/+9
2015-10-09Merge "Rework pacemaker constraints from ovs and netns cleanup agents"Jenkins1-18/+22
2015-10-08Merge "puppet: allow to configure any ceilometer param with Hiera"Jenkins3-0/+3
2015-10-07Merge "Enable Cisco N1KV driver"Jenkins3-0/+73