aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-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-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-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
2016-08-17Merge "Remove unneeded net_ip_map dump into hieradata"Jenkins5-20/+0
2016-08-17Merge "Remove deprecated net_ip_uri_map output"Jenkins8-55/+50
2016-08-17Merge "Remove deprecated net_ip_subnet_map output"Jenkins6-28/+40
2016-08-17Merge "Add cinder-backup service as role"Jenkins9-1/+104
2016-08-16gnocchi: use new authtoken parametersEmilien Macchi2-21/+20
Configure Gnocchi with authtoken new class in the Puppet module, and also remove the useless parameters that didn't exist in the module. Change-Id: I414990c4fd5c5c1cd43d50c7a3947a4a29f4587a
2016-08-17Merge "Set coordination url for gnocchi storage"Jenkins1-0/+12
2016-08-16Merge "Move neutron settings out of puppet/compute.yaml"Jenkins2-54/+0
2016-08-16Merge "Mv Ceilometer settings out of puppet/compute.yaml"Jenkins2-25/+6
2016-08-16Merge "Move Nova settings out of puppet/compute.yaml"Jenkins6-108/+62
2016-08-16Remove unneeded net_ip_map dump into hieradataGiulio Fidente5-20/+0
We will lookup bind addresses using map_replace within the templates so dumping net_ip_map as hieradata is unneeded. Change-Id: If54c9033fc58d2cfaa040e30adeed7f58e44fd88
2016-08-16Remove deprecated net_ip_uri_map outputGiulio Fidente8-55/+50
Takes the net_ip_uri_map value from the *_uri values emitted by net_ip_map instead. Also removes TenantIp and TenantIpUri from net_vip_map_external templates as there won't be any VIP on the tenant network. Change-Id: Icdac3d58162891f5ca3d5c20f14fcdff1781996f
2016-08-16Remove deprecated net_ip_subnet_map outputGiulio Fidente6-28/+40
Change-Id: I83ca923140d7f8ca3101e851e88ca3107a99555a
2016-08-15Merge "Remove deprecated hdp plugin and add ambari"Jenkins1-1/+1
2016-08-15Move neutron settings out of puppet/compute.yamlDan Prince2-54/+0
This finishes moving most of the config settings out of compute.yaml for Neutron and Rabbit. Also removes some other misc unused parameters. Change-Id: Ie340c33fb3434eb70e131ff6e252d0909aabd37c Related-Bug: #1604412
2016-08-15Mv Ceilometer settings out of puppet/compute.yamlDan Prince2-25/+6
This finishes moving most of the config settings out of compute.yaml for Ceilometer. Change-Id: I96369ebba28f0af4eb2d6d520b478213d8021822 Related-Bug: #1604412
2016-08-15Move Nova settings out of puppet/compute.yamlDan Prince6-108/+62
This finishes moving most of the config settings out of compute.yaml for Nova and into the proper nova-* services. Only the bind port/VIP related Nova settings remain now and those will be dealt with in a follow up patch. Change-Id: I1c40e7d54c11dfff2aaa6438c7701e98da17ebe6 Related-Bug: #1604412
2016-08-15Merge "Convert ServiceNetMap to a nested template"Jenkins5-113/+172
2016-08-15Merge "Remove NeutronEnableTunnelling from templates"Jenkins4-6/+4
2016-08-13Merge "Remove KeystoneRegion from controller.yaml"Jenkins1-5/+0
2016-08-12Remove NeutronEnableTunnelling from templatesBob Fournier4-6/+4
As described in https://bugs.launchpad.net/tripleo/+bug/1532830, the OVS agent no longer uses enable_tunneling, which is controlled by NeutronEnableTunnelling, so this change removes NeutronEnableTunnelling from the Heat templates. This change depends on NeutronEnableTunnelling also being removed from python-tripleoclient and puppet-neutron no longer using the enable_tunneling hieradata. Change-Id: I1ff6902ebd15041fc57ffff20a07455f171a004b Closes-Bug: 1532830 Depends-On: I28d33592374f60cb5222a866efaf9d137aca1c5a Depends-On: I73630653330c67444827f32740c44e9d25b5db31
2016-08-12Rename NeutronServer to NeutronApi to align with ServiceNetMapSteven Hardy3-3/+6
The new composable service name conflicts with the existing ServiceNetMap naming, so align with NeutronApi since ServiceNetMap exists in current released versions. This is required so we can correctly generate the neutron_api_node_ips list (needed by puppet-tripleo) based on the service_name. Change-Id: Ic1d45cbaa77bc6ac9ca247c880a9845ca49905da Partially-Implements: blueprint custom-roles
2016-08-12Remove deprecated node_ips hiera keysSteven Hardy1-32/+0
This aligns with the new naming conventions in puppet-tripleo, so the keys can be more easily generated from the service_names. Change-Id: Idb4a740e70257e3c69d8ec7d0c88594cc091b6a7 Partially-Implements: blueprint custom-roles Depends-On: I423b544df174254ac511b906b0c570e701678022