summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-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-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-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-19Align some defaults with with ControllerCount defaultSteven Hardy1-2/+2
NeutronDhcpAgentsPerNetwork is normally correlated with the number of controllers, so given that the template defaults the ControllerCount to 1, 1 seems like a more consistent value for NeutronDhcpAgentsPerNetwork, and it's consistent with what we test in CI. Also NeutronL3HA defaults to False, which is consistent with the default ControllerCount of 1, but NeutronAllowL3AgentFailover defaults to True, which I assume makes no sense if there's only 1 controller and no HA Change-Id: I4612060979d1e4381800f30e359f58aeef61b861
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