summaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
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)"Jenkins3-0/+43
2015-10-23Fix password issue with mysql address for ceilometerJuan Antonio Osorio Robles1-1/+3
The password was being passed incorrectly to the mysql address used for ceilometer. Change-Id: I36d92e199d6d75b58ef8c1b66a2dfbcb7052f948
2015-10-21Merge "controller/ceilometer: use internalURL for os endpoint type"Jenkins1-0/+3
2015-10-21Merge "Sync httpd vhost settings in between pcmk and non-pcmk scenarios"Jenkins3-8/+3
2015-10-19Support NFS backend for Glance (via Pacemaker)Jiri Stransky3-0/+43
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-19controller/ceilometer: use internalURL for os endpoint typeEmilien Macchi1-0/+3
To let ceilometer access to keystone endpoints, use internalURL instead of publicURL for security & performances reasons. Ceilometer services (API, agents) will use internalURL endpoint to talk to other services (keystone, neutron, etc). Change-Id: I4cb843400f244cd34bbae4bc76371977780c7943
2015-10-19nova: set catalog_info to InternalURLEmilien Macchi2-4/+2
In nova.conf, set cinder/catalog_info to 'volumev2:cinderv2:internalURL' instead of 'volumev2:cinderv2:publicURL'. So Nova will use internal Cinder endpoint to reach volume API by using internal network. Depends-On: Id9e579ca31364d5207d0c1b892d0f7aa7f20f7a8 Change-Id: Ia34f0fe59f662c3ad29ca0178c01ef1570759d57
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-16Merge "Puppet / Compute: allow to run Ephemeral only storage with RBD"Jenkins2-2/+9
2015-10-16Merge "Allow a deployer to specify HAProxy syslog server address"Jenkins1-0/+6
2015-10-15Sync httpd vhost settings in between pcmk and non-pcmk scenariosGiulio Fidente3-8/+3
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-15Set Django cache backend to Memcached instead of LocMemCacheGiulio Fidente1-0/+1
Change-Id: Ia2079fc3e350cc677811ebb970cd2b306d6e7040
2015-10-14Merge "Set shared secrets, keys and passwords as hidden"Jenkins4-0/+8
2015-10-13Merge "Parameterize RabbitMQ FD limit"Jenkins1-0/+13
2015-10-13Add more components virtual ip mapping into controller.Yanis Guenane1-0/+12
Currently only Glance and Heat have their virtual IP passed to the contrller directly. This commit adds the same feature for : * Ceilometer * Cinder * Nova * Swift Change-Id: I295d15d7a0aa33175a5530e3b155b0c61983b6ae
2015-10-13Parameterize RabbitMQ FD limitGiulio Fidente1-0/+13
Together with [1] this change permits to parameterize the file descriptor limit for RabbitMQ for both the Systemd startup script and the Pacemaker resource agent. 1. https://github.com/puppetlabs/puppetlabs-rabbitmq/commit/20325325b977c508b151ef8036107dcfefdf990b Closes-Bug: 1474586 Change-Id: I62d31e483641ccb5cf489df81146ecb31d0c423f
2015-10-13Allow a deployer to specify HAProxy syslog server addressYanis Guenane1-0/+6
This commit aims to allow a deployer to specify where to send haproxy's logs. It is backward compatible with what is already in place and send the logs to the UNIX socket /dev/log The value specified here will be written in the haproxy.cfg file with the following behavior HAProxySyslogAddress: 127.0.0.1 -> log 127.0.0.1 local0 HAProxySyslogAddress: ::1 -> log ::1 local0 HAProxySyslogAddress: /dev/log -> log /dev/log local0 (default) Change-Id: I46c489a1f424e2219d129f332e64c64019aef850 Depends-On: If7f7c8154e544e5d8a49f79f642e1ad01644a66d
2015-10-12Puppet / Compute: allow to run Ephemeral only storage with RBDEmilien Macchi2-2/+9
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-12Set shared secrets, keys and passwords as hiddenJuan Antonio Osorio Robles4-0/+8
Change-Id: Ieb27729c6b33ffc849d07200ec0d42508214956e Closes-Bug: #1399793
2015-10-12Merge "Allow one to specify horizon ALLOWED_HOSTS"Jenkins2-1/+6
2015-10-12Allow one to specify horizon ALLOWED_HOSTSYanis Guenane2-1/+6
If horizon is running in production (DEBUG is False), it will answer only to the IPs/hostnames specified in the ALLOWED_HOSTS variable in the local_settings.py configuration file. The puppet-horizon module offer the feature to customize that, tripleo-heat-teamplates was missing the link between the top-level parameter and the puppet parameter, hence this commit. More info : * https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts * https://github.com/openstack/puppet-horizon/blob/master/templates/local_settings.py.erb#L14-L24 Change-Id: I5faede8b74a0318e15baa761dc502b95b051ae0d
2015-10-12Merge "Allow enabling debug mode for config management (Puppet)"Jenkins7-0/+45
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"Jenkins3-8/+9
2015-10-09Merge "Rework pacemaker constraints from ovs and netns cleanup agents"Jenkins1-18/+22
2015-10-09Merge "Wire in NodeExtraConfig interface"Jenkins5-0/+40
2015-10-08Ensure Glance API reaches Registry using the service VIPGiulio Fidente1-2/+6
Previously the Registry service was reached using the local IP. Change-Id: I8f2b7275cd39d8a5358d8ce69f4f7e5bc7758b62
2015-10-08Merge "puppet: allow to configure any ceilometer param with Hiera"Jenkins3-0/+3
2015-10-07Merge "Enable Cisco N1KV driver"Jenkins6-0/+249
2015-10-06Rework pacemaker constraints from ovs and netns cleanup agentsmarios1-18/+22
In the current neutron-* services constraints chain, the ovs and netns cleanup services are re-run after a neutron-server restart. As discussed at [1] this may not be desirable leaving some neutron services down and any tenant routers without IP. This review introduces a second constraints chain so we now have: neutron-server-->openvswitch-->dhcp-->l3-->metadata and ovs-cleanup-->netns-cleanup-->openvswitch Instead of a single chain like neutron-server-->ovs-cleanup-->netns-cleanup-->openvswitch--> dhcp-->l3-->metadata [1] https://bugzilla.redhat.com/show_bug.cgi?id=1266910#c12 Related-Bug: 1501378 Change-Id: I4096704257aff74ff5bd37d8d01d8a776c6c6a76
2015-10-05Fix MariaDB account removal race conditionJiri Stransky3-8/+9
The removal of default MariaDB accounts was being triggered roughly at the same time on all controllers, causing a race condition -- multiple nodes found an account present and attempted deletion, but then only one succeeded with the deletion, the others failed. HA controller deletes the accounts only on bootstrap node now, which fixes the issue. Change-Id: Ieacd10a6ce26da50f6a37eaa3221d866c24353fa
2015-10-02puppet: allow to configure any ceilometer param with HieraEmilien Macchi3-0/+3
By including ::ceilometer::config on controller & compute, we allow anyone to trick ceilometer.conf with any parameter, using Hiera. Change-Id: Ie6698d5e6900ecaaf7f19ed79e9c44b39ced0559
2015-10-01Merge "swift::storage::all deprecation cleanup"Jenkins1-1/+4
2015-10-01Wire in NodeExtraConfig interfaceSteven Hardy5-0/+40
It's become apparent that some actions are required in the pre-deploy phase for all nodes, for example applying common hieradata overrides, or also as a place to hook in logic which must happen for all nodes prior to their removal on scale down (such as unregistration from a satellite server, which currently doesn't work via the *NodesPostDeployment for scale-down usage). So, add a new interface that enables ExtraConfig per-node (inside the scaled unit, vs AllNodes which is used for the cluster-wide config outside of the ResourceGroup) Change-Id: Ic865908e97483753e58bc18e360ebe50557ab93c
2015-10-01Ensure present/latest for puppet driven package updatesSteve Baker5-5/+26
This change updates yum_update.sh so that we set set a boolean output when "managed" packages should get updated. The output is named 'update_managed_packages' and for the puppet implementation it is wired up so that it directly sets tripleo::packages::enable_upgrade to control whether packages are updated. It also modifies yum_update.sh to build a yum update excludes list for packages managed by puppet. The exclude lists are being generated via puppet-tripleo as well via the new 'write_package_names' function that is now wired into all the role manifests. This change does not actually trigger the puppet apply. The fix for Related-Bug: #1463092 will be used to trigger the puppet run when the hiera changes. As a minor tweak to this logic we append the UpdateIdentifier to the config_identifier so that we ensure puppet gets executed on an update where other (non-related) hiera changes also occur. Co-Authored-By: Dan Prince <dprince@redhat.com> Change-Id: I343c3959517eae38bbcd43648ed56f610272864d
2015-10-01Write package names out to flat filesDan Prince7-2/+14
This patch updates all of the overcloud manifests so that we write out flat files containing lists of the Puppet packages which were managed by each manifest. The flat files all get written to /var/lib/puppet-tripleo/installed-packages/ where they can be easily parsed by external tools. Example format from the flat files looks like (for the controller step 1): cat /var/lib/puppet-tripleo/installed-packages/overcloud_controller1 keepalived haproxy Depends-On: If3e03b1983fed47082fac8ce63f975557dbc503c Change-Id: Ia324a08711796aa664f9c0273a051f4f2e3e92c9
2015-09-30Allow enabling debug mode for config management (Puppet)Jiri Stransky7-0/+45
Also adds an environment file which can be passed to heat stack-create to enable debugging. Change-Id: I9758e2ca3de6a0bed6d20c37ea19e48f47220721 Depends-On: Ie92d1714a8d7e59d347474039be999bd3a2b542f
2015-09-30Enable Cisco N1KV driverShiva Prasad Rao6-0/+249
This enables support for the Cisco N1kv driver for the ML2 plugin. It also configures the Nexus 1000v switch. Co-Authored-By: Steven Hillman <sthillma@cisco.com> Depends-On: I02dda0685c7df9013693db5eeacb2f47745d05b5 Depends-On: I3f14cdce9b9bf278aa9b107b2d313e1e82a20709 Change-Id: Idf23ed11a53509c00aa5fea4c87a515f42ad744f
2015-09-28Merge "Adding core_plugin, type_drivers and service_plugins parameters"Jenkins4-8/+74
2015-09-25Adding core_plugin, type_drivers and service_plugins parametersShiva Prasad Rao4-8/+74
Make core_plugin, type_drivers and service_plugins parameter in neutron configurable through heat. Also changing the type_drivers order to "vxlan,vlan,flat,gre" Change-Id: Iba895ed5897bdaf7bb772ffc063c424abb6e1638
2015-09-25Add CephStorageExtraConfigPre resourceGiulio Fidente1-1/+12
This change adds a CephStorageExtraConfigPre which can be used to distribute hooks for the CephStorage nodes. Change-Id: Id0023d8ffddb3ee5e855d5dcc32c76bc41ce4c63
2015-09-25Allow a user to set specific setting per hostYanis Guenane5-0/+5
It is currently not possible to specify settings per host and not per type of host. One of the example of the problematic that could cause is : What if node0 have devices /dev/sdb and /dev/sdc while node1 have devices /dev/sda and /dev/sdd, they is currently no way to specify that simply. The idea here is to add a top priority file in the hiera lookup that will match the UUID of the System Information section in the output of the dmidecode command. The file could be provided with the firstboot/rsync stack for example. Change-Id: I3ab082c8ebd2567bd1d914fc0b924e19b1eff7d0
2015-09-25Example of passing per-node config data in pre_deploy configSteven Hardy1-0/+56
Shows one method of passing a map of data in to the pre_deploy extraconfig interface, such that it could be used in combination with https://review.openstack.org/#/c/215013/ to create a node uuid specific hieradata file, or to perform some other non-puppet per-node configuration. This would be used by specifying an environment file like: resource_registry: OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/per_node.yaml parameter_defaults: NodeDataLookup: | {"AB4114B1-9C9D-409A-BEFB-D88C151BF2C3": {"foo": "bar"}, "8CF1A7EA-7B4B-4433-AC83-17675514B1B8": {"foo2": "bar2"}} Change-Id: I62e344669e0ca781dd93d3f7d2190b70299877c2
2015-09-25Merge "Rename -puppet.yaml templates."Jenkins8-0/+0
2015-09-23Merge "Remove nameserver lookup dependency from Cisco ML2 CollectMacConfig."Jenkins1-2/+11
2015-09-23Merge "Add redis ordering with ceilometer-central"Jenkins1-0/+16
2015-09-23Merge "Re-add constranits between nova-api and nova-novncproxy"Jenkins1-18/+16