summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-25Merge "Update authtoken parameters to match recent changes"Jenkins8-21/+21
2016-08-25Merge "Move resource registry override to enable-tls.yaml"Jenkins3-6/+3
2016-08-25Merge "Allow a fixed IP to be allocated to RedisVirtualIP"Jenkins1-0/+7
2016-08-25Merge "Fix path to sahara templates"Jenkins1-2/+2
2016-08-24Update authtoken parameters to match recent changesEmilien Macchi8-21/+21
Update authtoken parameters for: - Aodh - Ironic - Manila - Nova - Ceilometer Change-Id: Ie123b8da1a7af2e406aadca4775de9e8c4e6e1f5
2016-08-25Merge "Updates and fixes to NIC config template routes"Jenkins27-55/+746
2016-08-24Merge "Fixes Neutron metadata parameters in THT"Jenkins1-2/+13
2016-08-24Merge "Fix check for MariaDB upgrade manual switch off"Jenkins1-1/+1
2016-08-24Merge "Permit usage of raw disks as backends for Swift storage"Jenkins3-2/+29
2016-08-24Fixes Neutron metadata parameters in THTTim Rozet1-2/+13
Changes include: - Adds missing parameter to enable DHCP Metadata networks, which is required to enable isolated or forced metadata via DHCP agent - Fixes isolated metadata parameter to use a boolean - Fixes regression where force metadata parameter was accidentally removed Closes-Bug: 1613743 Change-Id: I08f907fe8a8e89e108351b84db33c4d9c004b957 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-08-24Merge "Move Keepalived/HAproxy settings out of controller"Jenkins4-37/+45
2016-08-24Fix Flavor get_param for Block Storage.Sofer Athlan-Guyot1-1/+1
The get_param of the flavor was not pointing to the right parameter, leading to an empty flavor for the block storage and a failure during validation. Change-Id: Id9a3d5756be956cedf060443533b84fcc66e721c Closes-Bug: 1616453
2016-08-24Move Keepalived/HAproxy settings out of controllerDan Prince4-37/+45
This moves the config settings out of controller.yaml for Keepalived and HAproxy. NOTE: the tripleo::haproxy::redis_password wasn't getting set correctly before this patch. Looks like a breakages that occurred when puppet-tripleo dropped the loadbalancer class. Related-Bug: #1604414 Change-Id: Id24b02ac73f4ae33b20194da8a5f99f17403ece9
2016-08-24Fix check for MariaDB upgrade manual switch offJiri Stransky1-1/+1
The MySqlMajorUpgrade parameter has validation on it allowing only values yes/no/auto, however in the script we checked for '0' instead of 'no', which means the only effective values were yes/auto. This is now fixed to allow switching the migration off. Change-Id: I5d64734894c6bfd9003ad643f3747e34e62465cc Closes-Bug: #1616429
2016-08-24Merge "Move RabbitMQ settings out of controller.yaml"Jenkins3-33/+19
2016-08-24Merge "Move MySQL settings out of puppet/controller.yaml"Jenkins5-73/+43
2016-08-24Merge "Revert "Pin puppetlabs_spec_helper to 1.1.1""Jenkins1-3/+1
2016-08-23Move RabbitMQ settings out of controller.yamlDan Prince3-33/+19
This moves the config settings out of controller.yaml for RabbitMQ and into puppet/services/rabbitmq.yaml. Related-Bug: #1604414 Change-Id: I6b3d71653fb91b89b85dae7df4088afff22b71ac
2016-08-23Move MySQL settings out of puppet/controller.yamlDan Prince5-73/+43
This moves the config settings out of controller.yaml for MySQL and into puppet/services/database/mysql.yaml. The top leve MysqlRootPassword is still maintained by default in overcloud.yaml so that users who upgrade won't get broken. New users may optionally specify the MysqlRootPassword as a parameter instead which will take priority over the top level generated parameter. We drop the top level MysqlClusterUniquePart because it is no longer used (I think it was a remnant from t-i-e). Related-Bug: #1604414 Change-Id: I06ebac0f4c87dabfccefb2e550a64650868c5b26
2016-08-24Revert "Pin puppetlabs_spec_helper to 1.1.1"Emilien Macchi1-3/+1
This reverts commit 59e3f2c696d05e83cf48aa359901cedac592d596. Change-Id: I93c900177f0929604b6522b3b9aa40ff56dc8083
2016-08-23Merge "Set cinder::api::bind_host within service template"Jenkins4-31/+16
2016-08-23Pin puppetlabs_spec_helper to 1.1.1Emilien Macchi1-1/+3
Version 1.2.0 of puppetlabs_spec_helper pulled in a version gem with ruby 2.2 requirements. TripleO CI has ruby 2.0 so we need to pin the gem. Change-Id: I614ce29e83265ee48bb5f35fdd4a956346b0c69d
2016-08-23Permit usage of raw disks as backends for Swift storageGiulio Fidente3-2/+29
Adds a SwiftRawDisks parameter which can be used to provide a map disk-keyed with properties for each additional disk to be used as backend for Swift storage. Change-Id: I65ff488c8eb62c03fc45f04e70e18a5f4022d6b6 Depends-On: Id450e777930bb0b749c0ecfab0679a52a84fd7fe Depends-On: Iac75cf2244339fae444be5859b7583e80bafc4e2
2016-08-23Move resource registry override to enable-tls.yamlJuan Antonio Osorio Robles3-6/+3
It makes more sense for the enable-tls.yaml file to contain the resource registry override, since it contains parameters that are actually used there. Also, this allows us to reuse the tls-endpoints-public-* files for other methods of enabling TLS (such as with certmonger). Change-Id: I98c63d0007e61968c0490a474eddb42548891fa6
2016-08-22Don't trigger mariadb upgrade dump/restore when not neededJiri Stransky1-2/+2
When upgrading from mariadb X.Y.Z to mariadb X.Y.Ž (X.Y part stays the same), the dump/restore of mariadb shouldn't be necessary. Therefore we now only check for up to the first 2 fields of the version string when determining if we should trigger the dump/restore operation. Closes-Bug: #1615721 Change-Id: Ib7af8bfb121f5c83184d51b3c6dc657108c25973
2016-08-22Set cinder::api::bind_host within service templateGiulio Fidente4-31/+16
The map_replace at [1] will replace the network name with the local node IP address on the given network. 1. I7850d4dc8bf4db5f7ac6a6b53c1d900b561b4580 Change-Id: Ica064b5ffac61cebe2aae06d4f1d1d9e84258c10
2016-08-22Fix path to sahara templatesSagi Shnaidman1-2/+2
Fix path to sahara templates Change-Id: I7e60ed1800923057efe24badf03d76761da3f498
2016-08-20Merge "Add DefaultPasswords to composable services"Jenkins138-1/+542
2016-08-20Merge "Pass ServiceNetMap to services"Jenkins136-1/+987
2016-08-19Merge "Disable Sahara by default"Jenkins2-2/+5
2016-08-19Merge "Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml"Jenkins1-1/+0
2016-08-19Disable Sahara by defaultDan Prince2-2/+5
Users who want Sahara enable now can simply include the environments/services/sahara.yaml Heat environment. Change-Id: I3df96b6e78ba3eddb62e79d854862a7e2d614c51
2016-08-19Disable cinder-backup by defaultGiulio Fidente3-2/+5
The cinder-backup service was not configured in mitaka, so having it disabled by default does not change the existing behavior. Also adds an environment file to enable it in the pacemaker scenario. Change-Id: I9a238e0d4601c9f59aff94fdac837c7d0e90afa0
2016-08-18Add DefaultPasswords to composable servicesDan Prince138-1/+542
This patch adds a new DefaultPasswords parameter to composable services. This is needed to help provide access to top level password resources that overcloud.yaml currently manages (passwords for Rabbit, Mysql, etc.). Moving the RandomString resources into composable services would cause them to regenerate within the stack. With this approach we can leave them where they are while we deprecate the top level mechanism and move the code that uses the passwords into the composable services. Change-Id: I4f21603c58a169a093962594e860933306879e3f
2016-08-18Pass ServiceNetMap to servicesGiulio Fidente136-1/+987
This will be needed to pick the network where the service has to bind to from within the service template. Change-Id: I52652e1ad8c7b360efd2c7af199e35932aaaea8c
2016-08-18Merge "Add management network to list of networks to ping"Jenkins1-0/+1
2016-08-18Merge "Upgrade scripts to migrate aodh alarm data"Jenkins3-0/+62
2016-08-18Merge "Add tripleo-firewall composable service"Jenkins9-12/+25
2016-08-18Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yamlCarlos Camacho1-1/+0
Already with the same value in overcloud-resource-registry-puppet.yaml Change-Id: Ic274abddef5e229a3517f4f77d8192d6abf81044
2016-08-18Merge "Make sahara run via systemd"Jenkins1-5/+2
2016-08-18Merge "Add tripleo-packages composable service"Jenkins14-36/+31
2016-08-18Merge "Rename NeutronServer to NeutronApi to align with ServiceNetMap"Jenkins3-3/+6
2016-08-17Merge "Remove deprecated node_ips hiera keys"Jenkins1-32/+0
2016-08-17Merge "Decouple EndpointMap from SSL certificate params"Jenkins3-52/+113
2016-08-17Merge "gnocchi: use new authtoken parameters"Jenkins2-21/+20
2016-08-17Make sahara run via systemdMichele Baldessari1-5/+2
Via commit 0327fc2bbb1be9972d99e2e83d54d07410ad01d9 we added sahara as a composable service. Let's make sure sahara-api and sahara-engine run via systemd and not as a pacemaker resource. This is inline with the HA NG spec. Change-Id: I5634ad43771fba798892df6d2297c2634dcb6756
2016-08-17Upgrade scripts to migrate aodh alarm dataPradeep Kilambi3-0/+62
In Newton, Aodh will be using its own mysql DB rather than using ceilometer's mongo instance. This means we need to migrate any existing alarm and alrm history data from ceilometer DB to aodh mysqlDB. Upstream aodh provides us with a aodh-data-migration utility. We need to invoke this during the mitaka->newton upgrade procedure so data is migrated as expected and aodh mysql backend takes over. Closes-bug: #1611794 Change-Id: I17888b57ecf98cd83e92af2f9cdbead066b03aa3
2016-08-17Add tripleo-firewall composable serviceDan Prince9-12/+25
This creates a new service to help manage the puppet-tripleo class that enables firewall features. Currently has no settings but this will keep our interfaces consistent. Change-Id: I5ac85fa1e460b19ee2b1a9280413aebefe300845
2016-08-17Add tripleo-packages composable serviceDan Prince14-36/+31
This creates a new service to help manage the puppet-tripleo class that enables and disables package installation features. NOTE: we can't move the upgrade setting into the new composable service yet due to coupling with the UpgradeDeployment resources. Change-Id: If35cf6a6f023e12ae8ebbc2d9929d244eb3ffa3a
2016-08-17Merge "Update Ironic composable services"Jenkins7-8/+67