aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-11-13Merge "Fix cinder error when CinderNfsMountOptions option is absent"Jenkins2-2/+2
2015-11-13Pass ceph::pool arguments when calling classGiulio Fidente3-10/+6
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-13Merge "Refacter Endpoints into EndpointMap"Jenkins9-134/+493
2015-11-13Merge "Add DeployIdentifier overcloud parameter"Jenkins1-0/+11
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-13Set start/stop pacemaker resource timeouts for updatesJiri Stransky1-0/+72
This matches change I6fc18f1ad876c5a25723710a3b20d8ec9519dcba, but we need it to set it before attempting the cluster stop - yum update - cluster start cycle, to make sure this cycle doesn't hit the low timeout limits. This can be removed once updates from deployments made prior to I6fc18f1ad876c5a25723710a3b20d8ec9519dcba are no longer supported. Change-Id: I587136d8d045d213875c657ea5a405074f80c8ad
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 "Pin docker version for atomic at 1.8.2"Jenkins1-2/+3
2015-11-12Merge "Set default start/stop timeout for pcmk services to 95s"Jenkins1-8/+8
2015-11-12Merge "Change default bond-mode"Jenkins1-2/+1
2015-11-11Add DeployIdentifier overcloud parameterDan Prince1-0/+11
We've heard from end users that it is confusing that puppet isn't re-executed on a heat stack-update. This patch adds a new DeployIdentifier parameter which we can set via client tooling (tripleoclient) to a unique value so that on each heat stack-update we always execute all of our configuration deployments. Change-Id: Ic352ddd30807dc378e5e7b6c396bc53f5d6d5622 Related-bug: #1505430
2015-11-11Change default bond-modeJoe Talerico1-2/+1
The default balance-tcp is causing issues with deployments. Defaulting to active-backup. After ~ 100 guests (total) connectivity to each guest would become spotty (simple pings would fail, then become successful.) In /var/log/messages we saw : "overcloud-controller-1 kernel: openvswitch: ovs-system: deferred action limit reached, drop recirc action" For more details, refer to this link: http://openvswitch.org/pipermail/discuss/2015-October/019168.html Change-Id: Ia0f2592a289e13472b98d97057cd516c5048fe59
2015-11-11Add missing constraints in yum_update.shJames Slagle1-0/+30
Some missing pacemaker constraints were added in the following commits: https://review.openstack.org/#/c/219770/ https://review.openstack.org/#/c/219665/ https://review.openstack.org/#/c/218931/ https://review.openstack.org/#/c/218930/ Overclouds that were deployed prior to these constraints being added to tripleo-heat-templates still have the constraints missing. During an update, stopping and starting the cluster can fail without these constraints in place. As a workaround, conditionally add these contraints in yum_update.sh so that we're sure they're always present before updating. Change-Id: Id46c85dbbe5e85d362279661091b17ce1b697fe0
2015-11-11Merge "Allow customization of Ceph client user"Jenkins8-10/+38
2015-11-11Merge "Allow a user to specify a comma separated list of ntp servers"Jenkins6-31/+17
2015-11-11Add the GlanceRegistry and Horizon endpoints to EndpointMapMark Chappell1-0/+35
We need to pass details of the Glance Registry and public Horizon endpoints to the load balancers so add them to the EndpointMap Change-Id: Ia6261223e7701734f47ce48471c86f690ba3dcd5
2015-11-11Expose the IP of the EndpointsMark Chappell1-0/+1
We expose all of the other parameters, so expose the IP too for consistency Change-Id: I5c31befde51e398318c7b8c744310212288ad892
2015-11-11Make CloudName available for EndpointsMark Chappell3-3/+49
CloudName is the DNS name for the public VIP this means we will likely want it available for use in the endpoint hostnames, rather than people needing to copy and paste the same hostname Change-Id: Ic6d708b083244442195eee890de91bbc7e133ec2
2015-11-11Refacter Endpoints into EndpointMapMark Chappell9-134/+493
Because many of the service endpoints URLs use the same patterns for generating the URLs it makes sense to use the same templates to reduce the copy and paste. In the process also adds support for explicitly specifying hostnames for use in the endpoints. Note: DNS must be pre-configured. The Heat templates do not directly configure DNS. Change-Id: Ie3270909beca3d63f2d7e4bcb04c559380ddc54d Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
2015-11-11Merge "Enable glance-api show_image_direct_url for COW"Jenkins1-0/+1
2015-11-11Merge "Revert "Manage keystone initialization directly in t-h-t manifests""Jenkins4-289/+2
2015-11-11Merge "Align some defaults with with ControllerCount default"Jenkins1-2/+2
2015-11-10Merge "Allow customization of the Ceph pool names"Jenkins8-14/+59
2015-11-10Change the Atomic image name so it's less specificRyan Hallisey2-2/+2
The atomic image name in glance was being set to 'fedora-atomic'. The glance image can be any form of atomic distro so we shouldn't name this specifically 'fedora-atomic', but instead 'atomic-image'. Change-Id: Ic539b82b92e3fdd834750e591d8622b7dc85fc6d
2015-11-10Nova-libvirt needs to bind to /sys/fs/cgroupRyan Hallisey1-1/+1
Nova-compute was mounting in /sys/fs/cgroup when the libvirt container is the one that actually needs it. Change-Id: Iae5c7ad24083a8547474611d72f015c4fd23a073
2015-11-10honor the rabbit user and password providedMike Burns2-2/+4
Currently rabbit username and password are defaulted and attempting to use anything else would result in a failure during deployment. Change-Id: I8a2e240a19f915309eee45ea3c3368d131af6c1b Related: rhbz#1261303
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-09Pin docker version for atomic at 1.8.2Jeff Peeler1-2/+3
docker-latest now points to 1.9.0, which isn't the version we're targetting. More importantly, docker-1.9.0 doesn't work since it complains about /etc not being able to be relabeled. Not sure how to fix that, but we can save that battle for another time. Change-Id: I947b7569d9cf40a409253336e51b4dec5ada36f8
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-09Merge "Make puppet manifests compliant with Puppet 4.x"Jenkins8-363/+367
2015-11-09Merge "Add Puppet 4.x lint checks"Jenkins3-0/+31
2015-11-05Add support to tag patch port for Cisco Nexus1000v VSM bringupShiva Prasad Rao1-0/+5
In some deployments we will need to tag the patch port connecting to vsm-br in order for traffic to go out. This patch takes passes the vlan parameter to the puppet. Change-Id: I18734ae39007985769db9371abe1740e0f2872f7
2015-11-05Allow customization of Ceph client userGiulio Fidente8-10/+38
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 Fidente8-14/+59
This is useful in those scenarios were we want to use an external Ceph deployment with multiple overclouds. Change-Id: I1749d2a6547f6ce25843709e46a1447e8d42cfff
2015-11-05Merge "Add network templates for multiple NIC configuration"Jenkins7-0/+655
2015-11-05Make puppet manifests compliant with Puppet 4.xGael Chamoulaud8-363/+367
- 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-05Add Puppet 4.x lint checksGael Chamoulaud3-0/+31
- This change adds Puppet-lint bits for checking Puppet manifests. Change-Id: I82869d8f9f6c64ac2a95429f453c3cb76c046974 Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
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-04Revert "Manage keystone initialization directly in t-h-t manifests"Ben Nemec4-289/+2
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-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-02Add local docker registry supportRyan Hallisey4-15/+55
Create a set of environment variables that allows us to configure a docker registry for deployment. This patch assumes there is a local docker registry already setup with the images loaded in place. Change-Id: Iaafaf23eb3fa8b24bcd8f73bb38c552bea629607 Signed-off-by: Ian Main <imain@redhat.com> Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
2015-11-02Update docker compute environment to use json configRyan Hallisey4-32/+144
In liberty, Kolla copies around files and runs the service given a specified command, by reading a json file. This will update the existing work to follow that template by creating a json file for each of the services and pushing it into the containers. Change-Id: I5085d1896ea965fd8854765b055068a5ad30bcfd Co-Authored-By: Jeff Peeler <jpeeler@redhat.com>