aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-11-05Merge "Add network templates for multiple NIC configuration"Jenkins7-0/+655
2015-11-05Add network templates for multiple NIC configurationDan Sneddon7-0/+655
This change adds a set of network interface configurations for use with network isolation. The multiple-nics templates includes one separate NIC per network, and assumes that nic1 is used for the provisioning network (ctlplane). Also included is an environment file for including the multiple-nics configuration in a deployment. This revision changes the ordering of the NICs. By doing that, it is possible to wire up only a subset of the NICs for the storage nodes, and it is possilbe to leave the External NIC only configured on the controllers. rdo: Updated this commit for static control plane configuration Co-Authored-By: Rhys Oxenham <roxenham@redhat.com> Change-Id: Ic878d1ed1a85b5705295d087a743570ca8213504
2015-11-05Merge "compute/ceilometer: use internalURL for os endpoint type"Jenkins1-0/+1
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-04Merge "Manage keystone initialization directly in t-h-t manifests"Jenkins4-2/+289
2015-11-04Merge "Cisco Nexus ML2 MD: Need unique key for server level keys in hieradata"Jenkins1-3/+7
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 Guenane4-2/+289
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 Guenane4-3/+55
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)"Jenkins4-1/+44
2015-10-30compute/ceilometer: use internalURL for os endpoint typeEmilien Macchi1-0/+1
To let ceilometer access to keystone endpoints, use internalURL instead of publicURL for security & performances reasons. Change-Id: I6677f40038d6adf36b4f0375484b6ef2e16869e3
2015-10-29Merge "Fix password issue with mysql address for ceilometer"Jenkins1-1/+3
2015-10-23Merge "Add validation to ping the default gateway(s)"Jenkins1-1/+19
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-21Add validation to ping the default gateway(s)Dan Prince1-1/+19
This patch adds a new function that runs on all nodes so that all default gateways are ping tested early on during the installation process (before any puppet is executed) Note: this change depends on the static control plane network IPs because some distros allow/create multiple default routes without this patch (see depends-on below). Depends-On: Ib267e6dcf2d5ff77f7a82ee20a123965c2d07565 Change-Id: Ida125e79f3e549cae66be9dbd562197afa6400a5
2015-10-21Ensure ping returns after 5mins timeoutGiulio Fidente1-1/+1
This change ensures the validation script returns (with a failure) if the ping command remains stuck waiting for a response for more than 5 minutes. Change-Id: Ib184a01e04fe3c5e3ad13757a355735fff84548d
2015-10-21Merge "Sync httpd vhost settings in between pcmk and non-pcmk scenarios"Jenkins3-8/+3
2015-10-20Merge "Allow ctlplane network or ID, and default to "ctlplane""Jenkins1-3/+3
2015-10-20Merge "Update overcloud template description and Count constraints"Jenkins1-2/+6
2015-10-19Allow ctlplane network or ID, and default to "ctlplane"Steven Hardy1-3/+3
Currently you always have to pass the ctlplane ID because we're still using the deprecated network_id property for the neutron port resource. Since Juno, heat has supported a "network" property, which is used elsewhere, e.g the nested port stacks, so switch to using it in the overcloud-without-mergepy template, and flip the default to a more useful "ctlplane" vs an empty string. This means the stack create should just work on commonly documented deployments without requiring any parameter. Change-Id: Ifcea36d26b795c5e8b80accd8112e23b254127be
2015-10-19Update overcloud template description and Count constraintsSteven Hardy1-2/+6
Currently there's a vague list of services in the description, so instead describe the roles supported for deployment, and encode the minimum allowed of one Controller/Compute with zero Storage nodes in the parameter constraints. Change-Id: Ib4917843f3e4770f0260db72719ed6af0ee8dc13
2015-10-19Support NFS backend for Glance (via Pacemaker)Jiri Stransky4-1/+44
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 "Force stop a single node pacemaker on yum update"Jenkins1-1/+7
2015-10-16Merge "Puppet / Compute: allow to run Ephemeral only storage with RBD"Jenkins4-6/+18
2015-10-16Merge "Allow a deployer to specify HAProxy syslog server address"Jenkins2-0/+11
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-15Cisco Nexus ML2 MD: Need unique key for server level keys in hieradatatiswanso1-3/+7
Due to a limitation in the puppet version used in RHEL7 there is no simple way to scope a 2nd level hiera hash key with the create_resources + defined types pattern. Lack of the .each method support prior to puppet 4.0 is the problem here. This template change works around the problem by explicitly adding the hostname to the hieradata for a server under a nexus switch. The duplicate server names under different switches is needed for vPC config scenarios. Closes-bug: #1506546 Change-Id: I03b866fb440e968c9f86ae93942b687e7165a065
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"Jenkins9-0/+20
2015-10-13Merge "Parameterize RabbitMQ FD limit"Jenkins3-0/+23
2015-10-13Add more components virtual ip mapping into controller.Yanis Guenane2-0/+16
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 Fidente3-0/+23
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 Guenane2-0/+11
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 Macchi4-6/+18
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 Robles9-0/+20
Change-Id: Ieb27729c6b33ffc849d07200ec0d42508214956e Closes-Bug: #1399793
2015-10-12Merge "Allow one to specify horizon ALLOWED_HOSTS"Jenkins3-1/+11
2015-10-12Allow one to specify horizon ALLOWED_HOSTSYanis Guenane3-1/+11
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)"Jenkins8-0/+50
2015-10-12Merge "Move RHEL (un)registration to NodeExtraConfig"Jenkins6-8/+14
2015-10-12Merge "Ensure httpd is not enabled by puppet on system boot"Jenkins1-1/+4
2015-10-09Merge "Docker compute role configured via Puppet"Jenkins6-0/+400
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