aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-04-03Add missing ec2api::api::keystone_ec2_tokens_url configSven Anderson1-0/+5
Change-Id: I9a19aff24dede2bea3bf2959afa7adde00817ee0 Related-Bug: #1676491 (cherry picked from commit 10cb0cfdef9b3a4719f89bcc2cdf1dae4a14dcca)
2017-04-03Setting keystone region for tackerDan Radez1-0/+1
Change-Id: I170b7e4cff66f0a4b1b6d5735f93c9f0295a5ac5 (cherry picked from commit eb426db63c8cc48990a832f8e1b972feb93e7e92)
2017-04-03Merge "Add special case upgrade from openvswitch 2.5.0-14" into stable/ocataJenkins3-4/+11
2017-04-02Include panko in the default dispatcherPradeep Kilambi2-1/+5
panko is enabled by default, we might as well make it the default dispatcher along with gnocchi. Closes-bug: #1676900 Change-Id: Icb6c98ed0810724e4445d78f3d34d8b71db826ae (cherry picked from commit 568573b9b054c3804d9d1be2ce6ec2668ca2dbfb)
2017-04-02Merge "Fixes multiple issues with retry function in rhel-registration." into ↵Jenkins1-17/+31
stable/ocata
2017-04-02Add special case upgrade from openvswitch 2.5.0-14marios3-4/+11
In [1] we removed the previously used special case upgrade code. However we have since discovered that for openvswitch 2.5.0-14 the special case is still required with an extra flag to prevent the restart. This adds the upgrade code back into the minor update and 'manual upgrade' scripts for compute/swift. The review at If998704b3c4199bbae8a1d068c31a71763f5c8a2 is adding this logic for the ansible upgrade steps. Related-Bug: 1669714 [1] https://review.openstack.org/#/q/59e5f9597eb37f69045e470eb457b878728477d7 Change-Id: I3e5899e2d831b89745b2f37e61ff69dbf83ff595 (cherry picked from commit 25983882c2f7a8e8f8fb83bd967a67d008a556a4)
2017-04-02Merge "[N->O] Fix wrong database connection for cell0 during upgrade." into ↵Jenkins2-1/+11
stable/ocata
2017-04-01Don't check haproxy if external load-balancer is used.Sofer Athlan-Guyot1-1/+13
Change-Id: Ia65796b04be9f7cadc57af30ef66788dd8cb7de8 Closes-Bug: 1677539 (cherry picked from commit 56535c89ad6a5db718dc0fb89c19dda9fba251ca)
2017-03-31Merge "Stop openstack-nova-compute during nova-ironic upgrade" into stable/ocataJenkins1-0/+4
2017-03-31Re-Add bigswitch agent supportAlex Schultz5-1/+69
The agent configuration was lost in newton during the puppet-tripleo and THT role conversion. This change adds support for including the bigswitch agent service for composable roles. Change-Id: I46896389e48cdbe2864bf5b609a786f1c84ef908 Closes-Bug: #1673126 (cherry picked from commit 8eaa5f8e10a801be8fc45eeaaa479e7774d97997)
2017-03-31[N->O] Fix wrong database connection for cell0 during upgrade.Sofer Athlan-Guyot2-1/+11
During upgrade the cell0 database has the connection pointing to mysql+pymysql://nova:c2cdagE8PyAbnpers3AD88Hge@10.0.0.19/nova_cell0?bind_address=10.0.0.20 where 10.0.0.20 was the ip of the bootstrap node. This makes the nova-api fails on 2/3 node at the end of the major-upgrade-composable-steps.yaml step. We do have the right value in the hiera database so make sure we use it for cell0 creation and not the nova.conf file which hasn't been updated yet. Change-Id: I09775206cb8fc5e15934f7e4475506a7fe17271e Closes-Bug: #1675359 (cherry picked from commit c9c3813b6a0811a262068d0aab28d0bd535be3e1)
2017-03-31Merge "[N->O] is creating 2 default cell_v2 cells" into stable/ocataJenkins1-4/+4
2017-03-31Merge "Run cluster check on nodes configured in wsrep_cluster_address." into ↵Jenkins1-9/+13
stable/ocata
2017-03-30Stop openstack-nova-compute during nova-ironic upgradeMarius Cornea1-0/+4
This change ensures that that openstack-nova-compute is stopped and disabled during the upgrade process. Closes-Bug: 1675814 Change-Id: Ifd2557b11e4317f1e76e459e8de4162116578eff (cherry picked from commit 276aca7a8145570301e566a8fb3253f57601d171)
2017-03-30Run cluster check on nodes configured in wsrep_cluster_address.Yurii Prokulevych1-9/+13
Attempt to check galera's cluster status fails when galera service is not running on the same node. Change-Id: I27fb0841d85cd0dc86e92ac2e21eedf5f8f863ab Closes-Bug: #1677574 (cherry picked from commit d39c952fd3150d24c9e01c15806181715d0760f8 )
2017-03-30Merge "N->O Upgrade, make sure all nova placement parameter properly set." ↵Jenkins1-3/+6
into stable/ocata
2017-03-30Merge "N->O upgrade, blanks ipv6 rules before activating it." into stable/ocataJenkins1-0/+6
2017-03-30Merge "Nic config mappings for deployed-server" into stable/ocataJenkins2-4/+11
2017-03-29Merge "Enables increasing mariadb open files for noha deployments" into ↵Jenkins1-0/+6
stable/ocata
2017-03-29Merge "Sort ResourceGroup resource list" into stable/ocataJenkins1-1/+1
2017-03-29Modify pci_passthrough hiera value as stringSaravanan KR2-2/+10
Hiera value of nova::compute::pci_passthrough should be a string. It has been modified to JSON with the heira hook changes. Modifying it again back to string. Closes-Bug: #1675036 Change-Id: I441907ff313ecc5b7b4da562c6be195687fc6c76 (cherry picked from commit 57c06ddefd4d7ff87de02dab9d1c5e92eb8e6eef)
2017-03-29Merge "Only set EnableConfigPurge on major upgrades" into stable/ocataJenkins5-9/+11
2017-03-28Remove 'Controller' role references from overcloud.j2.yamlDan Prince1-6/+6
This patch again removes hard coded role references to the overcloud.yaml template that was added in fd15a091f7ab6927833275df17b96ecacc2b1827. This breaks the composable undercloud work (undercloud-containers ci job as well). Change-Id: Ie30b2573dc4d2b45ebc0afc0e0d73bfdf41e4d4b Closes-bug: #1676528 (cherry picked from commit f7f1a8a6d8cfd4c78ffd256497b32daa5908641e)
2017-03-28Merge "Fixes missing firewall rules for neutron_ovs_dpdk_agent service" into ↵Jenkins2-1/+9
stable/ocata
2017-03-28Only set EnableConfigPurge on major upgradesSteven Hardy5-9/+11
Bug #1611800 fixed an upgrade issue by enabling purging configs for some services, but this causes issues such as longer updates and restarting services in the minor update case, so only do this for major upgrades, and default to false. Conflicts: (don't exist on this branch) environments/major-upgrade-composable-steps-docker.yaml environments/major-upgrade-converge-docker.yaml Related-Bug: #1611800 Closes-Bug: #1674858 Change-Id: Iff7d715f6730c5633f1146008504b4309ef3133d (cherry picked from commit 947a7148e807e74daf9e30e4e8c891d5bdacc69f)
2017-03-28[N->O] is creating 2 default cell_v2 cellsOliver Walsh1-4/+4
A side-effect of running map_cell_and_hosts is that a default cell is created (unless host mappings already exists). As we are explicitly creating the default cell we need to run discover_hosts to create the host mappings. Change-Id: I1a28e9b85a7c43561700faf692248c5fc06b8ad8 Closes-Bug: #1675418 (cherry picked from commit ab4adb9fb1b1ba003a8045ce4c3879f88ea243b3)
2017-03-28Nic config mappings for deployed-serverJames Slagle2-4/+11
Adds default nic config mappings when using the deployed-server custom roles data at deployed-server/deployed-server-roles-data.yaml. Previously there were no default mappings as the hardcoded mapping for the Controller role from overcloud-resource-registry-puppet.j2.yaml would not be used since there is no Controller role when using deployed-server. The default mapping is net-config-static.yaml instead of net-config-noop.yaml, since there is no requirement of a L2 domain for dhcp between undercloud and overcloud nodes when using deployed-server. The convenience mapping of ControllerDeployedServer to net-config-static-bridge.yaml is also added so that out of the box the roles with controller services will get the right bridge created. The mappings can always be overridden in later environment files if needed. Change-Id: I581fec99b459a12512686e47b10b962756652eb3 Closes-Bug: #1670493 Depends-On: Ib681729cc2728ca4b0486c14166b6b702edfcaab (cherry picked from commit cdbf1ca1918af649d1079ee07a9303059c9723ed)
2017-03-28Merge "Fix usage of CinderNfsServers" into stable/ocataJenkins2-5/+7
2017-03-28Merge "Don't try to run os-net-config from yum_update.sh" into stable/ocataJenkins1-11/+0
2017-03-27Sort ResourceGroup resource listJames Slagle1-1/+1
We should sort the results by resource_name when listing resources in the ResourceGroup stack in get-occ-config.sh, as the order is not guaranteed. We want the order to always be numerical ascending by resource_name (which are just integers starting at 0). Change-Id: Iccef81e4dfd9586e0030f20bdde131d1a885eb19 Closes-Bug: #1665458 (cherry picked from commit c5e5d21a61808f7c09b85a2750a905bb57b54be1)
2017-03-27Merge "Install openstack-selinux for deployed-server" into stable/ocataJenkins3-2/+10
2017-03-27Setting keystone region for congressDan Radez1-0/+1
Change-Id: I4958b886cbd6c2b34da0c265e8774105474ace13 (cherry picked from commit 32be46f508423c822208e3c9f3afb32902f1c1ae)
2017-03-27N->O upgrade, blanks ipv6 rules before activating it.Sofer Athlan-Guyot1-0/+6
When the firewall is enabled with ipv6, the default rules set is taken as not ipv6 firewall was present for Newton. This make communication impossible until puppet is run again. This ensures that no rules are loaded when the firewall is enabled. This mimic this patch[1] [1] https://github.com/openstack/tripleo-heat-templates/commit/ae8aac36143d5dadb08af0d275f513678909dcc7 Change-Id: Id878b5caae666a799c89c8466ce46b9ecb86d9f7 Closes-Bug: #1675782 (cherry picked from commit 670399a2caeecd9259bea454e9518ab6c92cff49)
2017-03-27N->O Upgrade, make sure all nova placement parameter properly set.Sofer Athlan-Guyot1-3/+6
The restart of openstack-nova-compute takes place before crudini set the password, user_domain and project_name get set. Change-Id: I57b54d5f59d5803d7ad4e399d598f699785a5825 Closes-Bug: #1675739 Co-Authored-By: Oliver Walsh <owalsh@redhat.com> (cherry picked from commit bfd485406d8f3847b1969579ebbdaa912c592a4a)
2017-03-27Fix usage of CinderNfsServersChristian Schwede2-5/+7
This feature stopped working somewhere along the lines. In the past it was working with parameter_defaults like this: CinderNfsServers: '10.0.0.254:/srv/nfs/cinder' or CinderNfsServers: "[fd00:fd00:fd00:3000::1]:/srv/nfs/cinder" The problem was that the templating escaped these strings, and puppet-tripleo didn't receive a proper array, but a string. This patch fixes this. It accepts strings as above as well as comma-delimited lists of Nfs Servers. Closes-Bug: 1671153 Change-Id: I89439c1d969e92cb8e0503de561e22409deafdfc (cherry picked from commit 9445b0e0972696e7de1c0a702f456571d12fa964)
2017-03-27Merge "etcd: secure EtcdInitialClusterToken parameter" into stable/ocataJenkins2-1/+7
2017-03-26Install openstack-selinux for deployed-serverJames Slagle3-2/+10
No other packages actually require openstack-selinux, so it must be explicity installed. Change-Id: Ic7b39ddfc4cfb28b8a08e9b02043211e4ca4a39a Closes-Bug: #1675170 (cherry picked from commit 583a60248f47428542a560a869aab04933512d94)
2017-03-26Merge "Deploy versionless keystone endpoints (for keystone only)" into ↵Jenkins1-0/+1
stable/ocata
2017-03-26Fixes missing firewall rules for neutron_ovs_dpdk_agent serviceTim Rozet2-1/+9
Firewall config was being inherited by the dpdk service, however since the firewall service name was the parent (neutron_ovs_agent) and technically that service was not enabled - the rules were never applied. This modifies the service name as it is inherited using map_replace. Closes-Bug: 1674689 Change-Id: I6676205b8fc1fd578cb2435ad97fe577a9e81d95 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 48a38a19347a18d4d35fb22de82136359aae5cb7)
2017-03-26Enables increasing mariadb open files for noha deploymentsTim Rozet1-0/+6
There is currently an issue where the max open files limit is hit with MariaDB in noha deployments, because it is defaulted to 1024 by system limits. In HA deployments the limit is bumped to 16384. This patch introduces a flag to be able to increase the limit to 16384 for noHA deployments. In the future we should change this to be an integer, and let the operator decide the setting. Since this setting is set in a different path for HA, we would need to implement a change that allows setting both (ha and nonha) via the same integer param. Depends-On: Ia0907b2ab6062a93fb9363e39c86535a490fbaf6 Closes-Bug: #1648181 Related-Bug: #1524809 Change-Id: I95393fc798b833a8575afbff03ef74a839565c5e Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 900ddfb27f0dd2afd8345d89a78b624f647b255d)
2017-03-25Merge "Explicitly configure credentials used by ironic to access other ↵Jenkins1-4/+39
services" into stable/ocata
2017-03-25Merge "Pick dynamically the first node for stack validation" into stable/ocataJenkins1-6/+18
2017-03-25Fixes OpenDaylightProviderMappings hiera parsingTim Rozet2-5/+5
The str_replace conversion used previously is no longer needed and breaks the hieradata value. Closes-Bug: 1675426 Change-Id: I7a052d1757efe36daf6ed47e55598ca3c2ee9055 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit ae10ae4a5a21bb58c183aa50f237ffa2d6f14280)
2017-03-23Merge "Add bindep support" into stable/ocataJenkins1-0/+2
2017-03-22etcd: secure EtcdInitialClusterToken parameterEmilien Macchi2-1/+7
Secure EtcdInitialClusterToken parameter by: * removing the default value. * make it hidden. Change-Id: I938af697f9faaadb9c9aeb950e9410db24b1b961 Depends-On: I6e30cce469736e84a3c483fafa29d542b8347ba9 Closes-Bug: #1673266 (cherry picked from commit 55d17ca118d27f16b57424774265f5b3db7b7b52)
2017-03-22Merge "Cleanup no longer used upgrade files" into stable/ocataJenkins13-1013/+0
2017-03-22Deploy versionless keystone endpoints (for keystone only)Juan Antonio Osorio Robles1-0/+1
The default is to deploy v2.0 endpoints, but this is not the recommended approach. we should instead be using versionless endpoints Change-Id: Icbfae1c2ff2b7312646fd8e817dd8209220a0d96 Related-Bug: #1667679 (cherry picked from commit 40a50031f37df0f0cde53e3f3c15ffe407fbdcbd)
2017-03-22Add bindep supportPaul Belanger1-0/+2
Bindep is an automation tool used by openstack-infra to bootstrap a worker with default packages. This is not needed, since we depend on puppet to automate this step. Change-Id: I759614ed0cf1fab5433956ed459419e564590398 Signed-off-by: Paul Belanger <pabelanger@redhat.com> (cherry picked from commit 209d8f5eac9273372aa44988436ae7f12596cd0d)
2017-03-22Don't try to run os-net-config from yum_update.shLukas Bezdicka1-11/+0
The UpdateDeployment already depends on NetworkDeployment. We should not run os-net-config unconditionally before update. Closes-Bug: #1666227 Change-Id: I48cbf5de00d47c6fdad71ff24c00e9db05cec5d5 (cherry picked from commit b19d6306ea582dc31ebfd609475d9ac4e641e278)
2017-03-21Explicitly configure credentials used by ironic to access other servicesDmitry Tantsur1-4/+39
Using keystone_authtoken credentials for this purpose is deprecated, and also prevents ironic-conductor from being used as a separate role. Also remove neutron_url, it can be fetched from the catalog instead. Change-Id: I12822568cb4db31808aec5fd407d71fe4b7b09e0 Depends-On: I21180678bec911f1be36e3b174bae81af042938c Partial-Bug: #1661250 (cherry picked from commit 91d7d8c46858d42e6cf2354a3be6af6c5bb9c02e)