summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-07Make containerized galera use mysql_network everywhereDamien Ciabrini1-0/+6
The containerized galera service generates a galera.cnf which uses short hostname to identify itself rather than the fqdn from the mysql_network (e.g. overcloud-x.internalapi.cloudname). This breaks when internal TLS is in use, because the mysql certificate does not reference this short hostname. Fix the appropriate hiera parameter to make it behave like the non-containerized galera service. Change-Id: I904cde38f2baeddab5178e8ad48d34a0c73629af Closes-Bug: #1719599 (cherry picked from commit e10aa591dc9155a2746df01279c4ba4f2133fd17)
2017-10-07Merge "Remove extra noop.yaml ports from network-isolation files." into ↵Jenkins2-6/+4
stable/pike
2017-10-07Merge "Default Ceph pg_num and pgp_num to 128" into stable/pikeJenkins6-2/+17
2017-10-07Merge "Support for Ocata-Pike live-migration over ssh" into stable/pikeJenkins14-12/+145
2017-10-07Merge "Fixes missing type for heat param TenantNetName" into stable/pikeJenkins2-24/+5
2017-10-07Merge "Use sub_nodes_private instead of node_private" into stable/pikeJenkins1-2/+2
2017-10-07Merge "Update panko port in env ssl yaml files to correct one" into stable/pikeJenkins4-18/+18
2017-10-07Merge "Bump fs.inotify.max_user_instances for scale" into stable/pikeJenkins1-0/+9
2017-10-07Merge "Drop extraconfig for nova-nuage" into stable/pikeJenkins4-94/+45
2017-10-07Merge "Fixes heat resource name for Internal API Network" into stable/pikeJenkins3-5/+8
2017-10-07Remove extra noop.yaml ports from network-isolation files.Dan Sneddon2-6/+4
The environments/network-isolation[-v6].yaml files have an unneeded reference to network/ports/noop.yaml for unused networks. This introduces a regression where environment files that define the networks and ports on a per-role basis can cancel out other environment files. See bug # 1717322. The overcloud-resource-registry.j2.yaml already uses noop.yaml for every network on every role (whether or not the networks are enabled, or whether the particular network is supposed to be on a role. So having noop.yaml specified for every role in network-isolation[-v6].yaml is not needed and can cause issues with upgrades if the environments are not included in a specific order. Change-Id: If06407e5235587af090ede44674bf9c7e08e340e Closes-bug: 1717322 (cherry picked from commit 9b08df3733257ac0fbc150a4071aec051e073ef7)
2017-10-07Support for Ocata-Pike live-migration over sshOliver Walsh14-12/+145
In Ocata all live-migration over ssh is performed on the default ssh port (22). In Pike the containerized live-migration over ssh is on port 2022 as the docker host's sshd is using port 22. To allow live migration during upgrade we need to temporarily pin the Pike computes to port 22 and in the final converge we can switch over to port 2022. This also changes the default port to 2022 for baremetal computes in Pike to enable live-migration between baremetal and containerized computes. Change-Id: Icb9bfdd9a99dc1dce28eb95c50a9a36bffa621b1 Depends-On: I0b80b81711f683be539939e7d084365ff63546d3 Closes-Bug: 1714171 (cherry picked from commit 17fd16b9f266e1aa67bf03ebdf309e89d668ada2)
2017-10-07Default Ceph pg_num and pgp_num to 128Giulio Fidente6-2/+17
As per Ceph docs [1] we should default pg_num and pgp_num to 128 when using less than 5 OSDs. This same change was applied to the ceph-ansible profiles with [2]. Also updates the CI environment files to continue using 32 where we deploy a single OSD. 1. http://docs.ceph.com/docs/master/rados/operations/placement-groups/ 2. Ibd9fb23e04576e95e24af58f856663397886a947 Change-Id: I1920bc8f5251f362af38ad3bd6f46dda42c6ee93 Closes-Bug: #1718756 (cherry picked from commit e17ae7620e03790da0d29092ab42e8089b2e8d11)
2017-10-07Use sub_nodes_private instead of node_privateSagi Shnaidman1-2/+2
node_private file doesn't exist anymore, use sub_nodes_private instead Change-Id: Ifb3af18733c0e1fd6895c270bb39199acaa98968
2017-10-07Fixes missing type for heat param TenantNetNameTim Rozet2-24/+5
Closes-Bug: 1720823 Change-Id: I239cc9f827fe99a553f9c18b80336bc6ce0b1d14 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit ba5436099d37898e418406f8b4376923e14f4c89)
2017-10-06Merge "Pin scenario001-multinode-containers to earlier ceph docker ↵Jenkins1-1/+1
container" into stable/pike
2017-10-05Pin scenario001-multinode-containers to earlier ceph docker containerJohn Fulton1-1/+1
Change-Id: I122a246a559e07ed74c69e3eb172a4bbb801aeb7 Closes-Bug: #1721239 (cherry picked from commit 3e8de70bd5a8c43389432d484189d4de5fc0ae2f)
2017-10-04Fixes heat resource name for Internal API NetworkTim Rozet3-5/+8
With the dynamic Jinja2 rendering for networks, the heat resource for Internal API network was accidentally being renamed to: OS::TripleO::Network::Internal when it should be the same as previous versions: OS::TripleO::Network::InternalApi This patch removes the 'compat_name' which was overriding the network name for rendering the resource. This patch also removes the compat_name functionality from the network/networks.j2.yaml file since it is no longer needed. Closes-Bug: 1718764 Change-Id: If756cddd91933edb303cc056515d98b941a3eb14 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 97244b942d29d2b5acd7a3eb07acdba0d9b99677)
2017-10-04Bump fs.inotify.max_user_instances for scaleSai Sindhur Malleni1-0/+9
Since each dnsmasq process consumes one inotify socket, the default value of fs.inotify.max_user_instances which is 128 lets us scale to only around a 116 neutron subnets (a few other sockets are used by other processes on the system). Since, we need to provide better defaults, this patch proposes to bump this value to 1024 by default, while giving the user a way to cahnge it. Based on https://unix.stackexchange.com/a/13757 each inotify watch takes 1KB of memory and we have fs.inotify.max_user_watches set to 8192 by default. This means that even in the worst case we won't be using more than 8MB of memory. Bumping the fs.inotify.max_user_instances value to 1024 is safe because there is fs.inotify.max_user_watches which caps the total number of files that can be watched by all the inotify instances a user has. Related Bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1474515 https://bugzilla.redhat.com/show_bug.cgi?id=1491505 Change-Id: I39664312bf6cf06f1e1ca2e86ffd86fb9a4582ad Closes-Bug: 1718266 (cherry picked from commit d2d0c3ff00de9b62382193d942239d543aa9499f)
2017-10-04Disable role host_prep_tasks on controlplane upgrademarios1-0/+7
During the controlplane upgrade the host_prep_tasks are being executed on the disable_upgrade_deployment roles too. This sets the role specific host_prep_tasks to an empty list for those roles during an upgrade, as executing them during the controlplane upgrade (during -e major-upgrade-composable-steps-docker.yaml) causes problems. They will be executed as part of the non controller upgrade as they are written to the stack outputs to be used as ansible playbooks (see bug 1708115 for more info on this) Change-Id: I42c963440b9b1e8222097c3d4e83ffcbe820886c Closes-Bug: 1719604 (cherry picked from commit 684267a7a4fbff489f6324020289afbdcaaca8f5)
2017-09-28Make CephConfigOverrides append to ceph.conf[global]Giulio Fidente1-4/+4
Previously it was mistakenly replacing the contents because we do not do deep merge. Change-Id: I145feb0208f135da7c71694ebcecd937244d66b1 Closes-Bug: #1719919 (cherry picked from commit 17416dcfc56c5148ccc9ab40297f99adfdcd085b)
2017-09-27Merge "Stop mapping docker to OS::Heat::None in scenarios" into stable/pikeJenkins6-31/+0
2017-09-27Merge "Add all services to scenario004-containers" into stable/pikeJenkins1-12/+27
2017-09-27Merge "Add a lightweight UC template/role data for deployed-servers" into ↵Jenkins2-0/+63
stable/pike
2017-09-27Merge "Fix upgrades that use Management network" into stable/pikeJenkins3-73/+5
2017-09-27Stop mapping docker to OS::Heat::None in scenariosJiri Stransky6-31/+0
This was needed to make the upgrade job on Ocata->Pike passing, and we now need to remove this to improve the argument order in OOOQ for deployments with scenarios. This shouldn't be backported to Ocata (at least not before we make the split between deploy scenario and upgrade scenario). Change-Id: Ie08bbe08530bd48a0ca58667f0704f360e0a4dd7 Co-Authored-By: Martin André <m.andre@redhat.com> Related-Bug: #1714905 Related-Bug: #1712070 (cherry picked from commit 31550b42027588d82f01db6956c1efaf02d58558)
2017-09-27Add all services to scenario004-containersJiri Stransky1-12/+27
This commit brings the scenario004 file closer to its BM pendant. We need to start with this one to address a chicken-and-egg issue with featureset files. Change-Id: Ia5c0cefb7051ca42b4d470f5a000eb446d18be30 Co-Authored-By: Martin André <m.andre@redhat.com> Related-Bug: #1714905 Related-Bug: #1712070 (cherry picked from commit b4d0a81e55ad51ecdaf2e923f794418ac77cfc57)
2017-09-25Fixes missing keystone authtoken pw for TackerTim Rozet2-0/+5
Closes-Bug: 1718997 Change-Id: I2b347cbc4595e6651b0d4be032cb862fde72e15f Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 253d9b9107aa158af5bcdafe510ecd96658ef137)
2017-09-25Merge "Move neutron api services to ControllerOpenstack" into stable/pikeJenkins2-5/+6
2017-09-25Merge "Fix issue where 2 Redis VIPs are assigned, but only one used." into ↵Jenkins1-3/+0
stable/pike
2017-09-25Merge "Fixed resource registry path in neutron-lbaasv2.yaml" into stable/pikeJenkins1-1/+1
2017-09-25Merge "Rename service_workflow_tasks into workflow_tasks" into stable/pikeJenkins12-18/+18
2017-09-25Merge "Remove deploy_steps_tasks.yaml from upgrade_steps_playbook" into ↵Jenkins1-5/+0
stable/pike
2017-09-22Fix upgrades that use Management networkDan Sneddon3-73/+5
Upgrades from older versions using Management network fail. This patch enables the management network even though it is not enabled in any of the role definitions. This will allow upgrades to complete using existing network environment files, without requiring operators to switch to the new method for defining which networks are attached to roles. Eventually these older environment files will be removed. Change-Id: Iadd12a559f0ad6918958a1355f189187fd327363 Closes-bug: 1717123 (cherry picked from commit 5b9fbc2b2bfa00de2fe0f437f21e05e3fc09a53d)
2017-09-22Fix issue where 2 Redis VIPs are assigned, but only one used.Dan Sneddon1-3/+0
There is an extra RedisVipPort defined in network-isolation.j2.yaml which is unused. This will waste an IP address, and can lead to confusion if there are multiple ports named RedisVipPort. This patch removes the extra (unneeded) instance of the VIP. Change-Id: I222873859af1b4ed1050cfffe55687b2f8d4c528 Closes-bug: 1717017 (cherry picked from commit f543752da6e1df3537ffa68d86806e11ac380375)
2017-09-22Fixed resource registry path in neutron-lbaasv2.yamlAneesh Puttur1-1/+1
Change-Id: Icb58d47a3911e83e2650b2c74b33eae522c84651 Closes-Bug: #1718451 (cherry picked from commit edc02b3352d53bdf460a495f689db55944eab432)
2017-09-22Merge "Create network-isolation-no-tunneling.yaml using jinja2" into stable/pikeJenkins2-61/+34
2017-09-22Move neutron api services to ControllerOpenstackAlex Schultz2-5/+6
The Networker role should not have the api services run on it. Instead these services should run as part of the ControllerOpenstack role that should be used with this role. Change-Id: Iabfe276fe700843f3a8da0b9e9220b2f82e20ec9 Closes-Bug: #1718299 (cherry picked from commit 964a5d738b8dbb6beb077d76448c6f3a84be2500)
2017-09-22Set Ceph pgp_num after pg_numGiulio Fidente1-1/+2
We missed to set the pgp_num default in ceph.conf, causing WARNING messages like: pool default.rgw.buckets.data pg_num 32 > pgp_num 8 Also increases the default pg_num to 128 which is the recommended value for less than 5 OSDs [1]. 1. http://docs.ceph.com/docs/master/rados/operations/placement-groups/ Change-Id: Ibd9fb23e04576e95e24af58f856663397886a947 Closes-Bug: #1718173 (cherry picked from commit 58e6f6533a04eddd2dc897d890737bbccde4ea7b)
2017-09-21Create network-isolation-no-tunneling.yaml using jinja2Antoni Segura Puimedon2-61/+34
The existing network-isolation-no-tunneling.yaml contains references to missing files. This patch generates the file with jinja to include custom networks and make it work with composable networks. Closes-Bug: #1718797 Change-Id: Ibcab2f6b5ac880a6b3d7dd5126bd24facfa17322 Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com> Co-authored-by: Dan Sneddon <dsneddon@redhat.com> (cherry picked from commit 47185342bdd247a2e2735ef96c777ecec663086d)
2017-09-21Merge "Adds post_upgrade_tasks for any service post-upgrade ansible tasks" ↵Jenkins5-16/+69
into stable/pike
2017-09-21Remove deploy_steps_tasks.yaml from upgrade_steps_playbookMarius Cornea1-5/+0
After landing https://review.openstack.org/#/c/503484/ we run the puppet host configuration steps twice. This change removes the deploy_steps_tasks.yaml playbook in order to run the puppet steps only once. Closes-bug: 1717244 Change-Id: I09461094618124915841c8390c8bce8daf64d029 (cherry picked from commit e471c67aab6a8f91011aa2330b3cf80f4427f443)
2017-09-21Merge "Make nova patching parameters configurable in Nuage" into stable/pikeJenkins2-0/+14
2017-09-21Merge "Use haproxy-systemd-wrapper as pid1 in containerized Haproxy" into ↵Jenkins2-6/+4
stable/pike
2017-09-21Merge "Disable all uses of wsrep-provider in mysql_bootstrap container" into ↵Jenkins1-2/+4
stable/pike
2017-09-20Update panko port in env ssl yaml files to correct onePradeep Kilambi4-18/+18
Change-Id: Iafe17a91c4695e442881e6fe813a6499f812f4b4 (cherry picked from commit 96667edee266bf2a64f7c8e2488c0eba105eaa8f)
2017-09-20Use haproxy-systemd-wrapper as pid1 in containerized HaproxyDamien Ciabrini2-6/+4
This wrapper binary spawns the HAproxy daemon and implements a coordinated HAproxy restart on SIGHUP. From a service's perspective, this allows reloading the HAProxy configuration with minimal service disruption, i.e. without stopping and restarting the HAProxy container. Closes-Bug: #1717521 Change-Id: Ib3ef0c0bcf1a8151e179ff4d7509cf0d6b3ac5a1 (cherry picked from commit 91cd44cd7266c15ce07fafbee9d2e33f226096ba)
2017-09-20Disable all uses of wsrep-provider in mysql_bootstrap containerDamien Ciabrini1-2/+4
During the bootstrap of the mariadb database, galera replication must be disabled while the users credentials are being set up. This is done by setting wsrep-provider=none when starting mysqld_safe. Icf67fd2fbf520e8a62405b4d49e8d5169ff3925b already disabled it when the clustercheck credentials are being set up, but Kolla also start a temporary server for setting up the root password. Disable the setting directly at the end of the mysql.cnf in the running container. That way, the default setting from galera.cnf will be overriden, all mysqld_safe calls will disable WSREP and the setting will stay ephemeral. Change-Id: If14e22992b46a35a05a16a9db5ecb360ea13df8f Closes-Bug: #1717250 (cherry picked from commit b0f50db80b10e9cd6263c4d6b3ca8dd818b658ba)
2017-09-20Adds post_upgrade_tasks for any service post-upgrade ansible tasksmarios5-16/+69
This adds a new config/deployment per role that will come after any post deploy steps. It drives the same ansible config as the upgrade_tasks but instead collects the post_upgrade_tasks for any service in the given role. The workflow is upgrade_tasks, then post deploy steps (either puppet/ or docker/ depending on the env) and then the post_upgrade_tasks added here. This is added to the pacemaker/cinder-volume.yaml service for now see the bug below for more info Change-Id: Iced34fecf02ebddc91df9302de54d2f4c2cab680 Closes-Bug: 1706951 (cherry picked from commit 2e182bffeeb099cb5e0b1747086fb0e0f57b7b5d)
2017-09-19Run gnocchi statsd and metrcd at step 5Dan Prince2-2/+2
Running these daemons at step 5 should avoid seeing error messages in the gnocchi-statsd log files on startup which starts at step4. Change-Id: Idb82f864a2e1c623dab7a2a87054443036670453 Closes-bug: #1713182 (cherry picked from commit 9d8e496f3e8a825d48d9eba9aab540001bb780ea)