aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-08-31Remove puppet run and workarounds from tripleo_upgrade_node.shmarios4-73/+23
For bug 1708115 and the O..P upgrade, and for the upgrade of 'non-controlers' we are now generating ansible playbooks from collected service upgrade_tasks and these are executed instead of the legacy tripleo_upgrade_node.sh. To clarify, by 'non-controllers' it is meant any node for which the corresponding roles_data.yaml role has the disable_upgrade_deployment flag set True. As a first pass, I am removing the workarounds from the script but keeping its delivery mechanism for now in case it is needed still. We can either update here to remove it or keep it until next cycle The most important part for now is that we no longer 'manually' run puppet here. Instead the post_deploy_steps are also collected into a playbook and will be executed after the upgrade_tasks (see the bug for discussion of the mechanism and related reviews) Change-Id: Ib017b0ab435ca9558cf8659d434489cdf01df955 Related-Bug: 1708115 (cherry picked from commit 4c5b9c5c967105536106fa4a7e1ec2352b14b08c)
2017-08-31Add --wsrep-provider=none to the mysql_bootstrap containerMichele Baldessari1-2/+2
Depending on the version of mariadb/galera installed the mysql_bootstrap command might fail. With the following unrevealing error: openstack-mariadb-docker:2017-08-28.10 "bash -ec 'if [ -e /v" 3 hours ago Exited (124) 3 hours ago The timeout is actually due to the fact that the following snippets does not complete within 60 seconds: """ if [ -e /var/lib/mysql/mysql ]; then exit 0; fi kolla_start mysqld_safe --skip-networking --wsrep-on=OFF & timeout ${DB_MAX_TIMEOUT} /bin/bash -c ''until mysqladmin -uroot -p"${DB_ROOT_PASSWORD}" ping 2>/dev/null; do sleep 1; done'' mysql -uroot -p"${DB_ROOT_PASSWORD}" -e "CREATE USER ''clustercheck''@''localhost'' IDENTIFIED BY '${DB_CLUSTERCHECK_PASSWORD}'';" mysql -uroot -p"${DB_ROOT_PASSWORD}" -e "GRANT PROCESS ON *.* TO ''clustercheck' """ The problem is that with older mariadb versions: galera-25.3.16-3.el7ost.x86_64 mariadb-5.5.56-2.el7.x86_64 The mysqld_safe process starts in galera mode (as opposed as to single local mode): 170830 17:03:05 [Note] WSREP: Start replication 170830 17:03:05 [Note] WSREP: GMCast version 0 ... 170830 17:03:05 [ERROR] WSREP: wsrep::connect() failed: 7 170830 17:03:05 [ERROR] Aborting That means that even though we specified --wsrep-on=OFF it is still starting in cluster mode. Let's add the extra --wsrep-provider=none which older versions required. Let's also add a '-x' to this transient container as that would have helped a bit because we would have understood right away that it was mysqld_safe that was not starting. I tested this successfully on an environment that showed the problem. The new option is still accepted by newer DB versions in any case. Closes-Bug: #1714057 Change-Id: Icf67fd2fbf520e8a62405b4d49e8d5169ff3925b Co-Authored-By: Mike Bayer <mbayer@redhat.com> (cherry picked from commit c19968ca852ab608513fe692aab958af25276220)
2017-08-31Telemetry specific config for scenario001Pradeep Kilambi2-0/+6
- Set gnocchi archivepolicy in scenario001 job to high - Set polling interval to 15 seconds instead of 300 Change-Id: Ie12abe1f03d000824c5fb1a46d74b94ce49d7876 (cherry picked from commit 0855d4c7b12d27721044ab09ca0d6e8f188d2e90)
2017-08-31Support HA for OVN DBs containers using pacemaker bundleNuman Siddique3-0/+169
ovn-dbs pacemaker bundle resources are created for supporting Master/Slave HA. puppet-tripleo already supports creating ovn-dbs bundle resources. The heat template added in this patch makes use of this. Closes-bug: #1699085 Change-Id: I23c2d312cfb144f9afc14f0982a92670dc29d74c (cherry picked from commit 444a39f5983e71e3222b6b7f8f523fce60aeece7)
2017-08-31Remove hard-coded image referenceJanki Chhatbar1-2/+0
This patch removes hard-coded reference to ODL related images. Logic is implemented in TripleO-common to render images based on the environment file specified. Change-Id: I9a11072f98e1245dc32d27d0b0e9bc6e9e19399f Partial-Bug: #1713685 (cherry picked from commit 21a6b66c8bb5377bc1391e3f582467de7f7b5562)
2017-08-31Move deprecated SchedulerHints logic to overcloud.j2.yamlSteven Hardy2-23/+29
The changes in puppet/role.role.j2.yaml should have been made to overcloud.j2.yaml, because we don't want the hard-coded reference to the deprecated name in the parent template. Note we need to pass this value from the parent template so the %index% substitution works, which is required for predictable placement via *SchedulerHints Partial-Bug: #1711656 Change-Id: Ided1802daac48d737f53caa7093df814ba101dd0 (cherry picked from commit c6207379db07544240b699ba000537b58d9fb68f)
2017-08-31Merge "Add support for Dell EMC VNX Manila Backend" into stable/pikeJenkins10-0/+110
2017-08-31Merge "Add support for Dell EMC Unity Manila Backend" into stable/pikeJenkins10-0/+109
2017-08-31Merge "Remove src_ceph from manila kolla_config" into stable/pikeJenkins1-5/+0
2017-08-31Merge "Change ManageEventPipeline to true" into stable/pikeJenkins2-1/+7
2017-08-31Merge "Use switch to containers instead of take over playbook for ↵Jenkins1-1/+2
ceph-ansible" into stable/pike
2017-08-31Merge "Add DockerPuppetProcessCount defaults to 3" into stable/pikeJenkins2-0/+7
2017-08-30Merge "Add missing Docker service" into stable/pikeJenkins5-0/+5
2017-08-30Merge "Set docker-puppet --health-cmd = /bin/true" into stable/pikeJenkins1-0/+1
2017-08-30Merge "container ovs-agent, ensure br-ex exists" into stable/pikeJenkins2-2/+33
2017-08-30Merge "Use integers for rabbitmq ports" into stable/pikeJenkins1-2/+2
2017-08-30Add support for Dell EMC VNX Manila Backendrajinir10-0/+110
This change adds support for manila::backend::dellemc_vnx Change-Id: I5fa5c2d6956429d1b9c12a5af6d4a887ed0624d9 Implements: blueprint dellemc-vnx-manila (cherry picked from commit a3debcfa8b2cbb3acaba292e082b0a3b0ee8ef54)
2017-08-30Add support for Dell EMC Unity Manila Backendrajinir10-0/+109
This change adds support for manila::backend::dellemc_unity Change-Id: Idec67d190b12359e8e6f1c157577088fa84ef41d Implements: blueprint dellemc-unity-manila (cherry picked from commit c5ee7b7714c712807f33ca1645186d33103a2264)
2017-08-30Merge "Update UPPER_CONSTRAINTS_FILE for stable/pike" into stable/pikeJenkins1-1/+1
2017-08-30Merge "Update .gitreview for stable/pike" into stable/pikeJenkins1-0/+1
2017-08-30Change ManageEventPipeline to truePradeep Kilambi2-1/+7
Since the event pipeline publisher defaults in the heat templates are different from what puppet sets. We need to have the Manage to true so override takes effect. Without this we keep defaulting back to puppet defaults. We can flip this back to false once panko:// is droppped as a supported option from the pipeline. Change-Id: I2248c165783dddfb4cb7cf5644884dd8f6e6ed63 (cherry picked from commit 941b5d6797ea54afbc7b822ee045ce1186627e7c)
2017-08-30container ovs-agent, ensure br-ex existsSteve Baker2-2/+33
Currently the container neutron-ovs-agent is stuck in a restart loop in many environments because the bridge br-ex is missing. This bridge is created by running the puppet class neutron::agents::ml2::ovs but limiting that run to tag neutron::plugins::ovs::bridge. The hiera neutron::agents::ml2::ovs::bridge_mappings should already exists to create the bridge with the required settings. This change should ensure br-ex exists after step 3. Since br-ex is created regardless of the chosen network config, environments/docker-network.yaml is not longer required. It can be deleted once there are no more references to it in CI and documentation. Change-Id: Ie425148b0ad0f38e149c5fa0a97d98ec35d0a5bb Closes-Bug: #1699261 Closes-Bug: #1691403 Closes-Bug: #1689556 (cherry picked from commit 76f130d6e8f7434433b2602af9794f1e9c742e1f)
2017-08-30Remove src_ceph from manila kolla_configJan Provaznik1-5/+0
Pacemaker puppet module takes care of mounting /etc/ceph into manila-share container (I23b6890b4cf7f1e6fe84b6be280dde82218275fc). Change-Id: I1026b2436275b17cfe3ac85192d42c5268f0a630 Related-To: I23b6890b4cf7f1e6fe84b6be280dde82218275fc (cherry picked from commit 0d8040ca33d42dbb7e06162f2b659ff6cbc0316f)
2017-08-30Use switch to containers instead of take over playbook for ceph-ansibleGiulio Fidente1-1/+2
On upgrade we need to run a specific playbook for ceph-ansible to be able to take over the pre-existing Ceph cluster deployed with puppet-ceph and the migrate it into a containerized deployment. This changes the playbook we use on upgrade so that it migrates the cluster in containers in addition to taking over the cluster. Change-Id: I353c219832c41328f298fa7b65768ecf26c37f29 (cherry picked from commit cab266c9b2b62c0033f8fb66e8e61b7aa46b3e2b)
2017-08-30Use integers for rabbitmq portsJuan Antonio Osorio Robles1-2/+2
They should be integers as specified in the parameter definition of the class. Else it'll fail. Change-Id: I06b6e46c0722516e28e8bff4d481fb4b7a08bd61 Closes-Bug: #1713659 (cherry picked from commit 4bea8cf918463c43c7d5f4e46984ab54271ea3e5)
2017-08-30Add missing Docker serviceAlex Schultz5-0/+5
The example composable roles are missing the docker service declaration so they currently do not work when trying to deploy with containerized services. Change-Id: I986ae561b950e74aacea10bce84673e8d0c9bd97 Closes-Bug: #1713755 (cherry picked from commit 50c975d1590930e6ce453942f99759a25ec08703)
2017-08-30Use Python to compute release notes versionEmilien Macchi1-2/+2
Leave the version fields blank, since the release notes document applies to all versions. That will avoid manual changes in the future like we did until now. Change-Id: Ibb33ade808c9866b5314b7dda60a44000089a467 (cherry picked from commit 4782394044a8f66de63db7772b7a5992a781cc57)
2017-08-30Merge "Support deploying OVN as container services" into stable/pikeJenkins5-0/+420
2017-08-30Merge "Make archive policy configurable" into stable/pikeJenkins1-1/+5
2017-08-29Add DockerPuppetProcessCount defaults to 3Dan Prince2-0/+7
docker-puppet.py is very aggressive about running concurrently. It uses python multiprocessing to run multiple config generating containers at once. This seems to work well in general, but in some cases... perhaps when the registry is slow or under heavy load can cause timeouts to occur. Lately I'm seeing several 'container did not start before the specified timeout' errors that always seem to occur when config files are generated (docker-puppet.py is initially executed. A couple of things: -when config files are generated this is the first time most of the containers are pulled to each host machine during deployment -docker-puppet.py runs many of these processes at once. Some of them run faster, other not. -docker daemon's pull limit defaults to 3. This would throttle the above a bit perhaps contributing the the likelyhood of a timeout. One solution that seems to work for me is to set the PROCESS_COUNT in docker-puppet.py to 3. As this matches docker daemon's default it is probably safer at the cost of being slightly slower in some cases. Change-Id: I17feb3abd9d36fe7c95865a064502ce9902a074e Closes-bug: #1713188 (cherry picked from commit 949d367ddeb42eff913cdbed733ccf6239b4864b)
2017-08-29Set docker-puppet --health-cmd = /bin/trueDan Prince1-0/+1
Change-Id: Idf627a348cad8d5287c82cb393367210f1c760cf Closes-bug: #1713185 (cherry picked from commit 20e1f0e8c9a2bbc3734f6eec0ee9ac2d5156f166)
2017-08-29manila: set "host" to "hostgroup"Tom Barron2-0/+12
when running manila-share under control of pacemaker, as is done for cinder-volume service in the same circumstance. Change-Id: Ic97f01913bae2a388c962a38fa175eb1d763cdcb Depends-On: Ie31f2d5ccf458f5fcfe8bec5f2c37f45070cfde2 Closes-Bug: #1712842 (cherry picked from commit 8fa6c6e58c7ac0d32bf2f0dfb586683cf006e3bf)
2017-08-29Merge "Enable ceilometer compute agent" into stable/pikeJenkins2-0/+2
2017-08-28Merge "Handle failure of carrier check in configure_safe_defaults()" into ↵Jenkins1-3/+4
stable/pike
2017-08-28Merge "Add panko publisher in the event pipeline" into stable/pikeJenkins1-1/+1
2017-08-28Support deploying OVN as container servicesNuman Siddique5-0/+420
This patch adds the support to containerize OVN services for the base profile. OVN db servers do not support active-active mode yet. It does support master-slave mode supported through pacemaker, which will be supported in a later patch. Presently the tripleo container framework doesn't allow to start a container in only controller 0 (or bootstrap node). OVN db servers and ovn-northd are started on all the controllers, but only the OVN db servers running in the boot strap controller are configured to listen on the tcp ports 6641 and 6642. OVN neutron mechanism driver and ovn-controller's use the ovn_dbs_vip to connect to the OVN db servers. Haproxy configures all the controllers as back ends, but only OVN db servers running on controller 0 respond since only they are configured properly. The OVN containers running on other controller nodes do not interact any way, but are wasteful resources. This patch also adds the scenario007-multinode-containers CI template. Partial-bug: #1699085 Change-Id: I98b85191cc1fd8c2b166924044d704e79a4c4c8a (cherry picked from commit e7cd03d2f0fcd8e3069246ced94f1a83869b8bea)
2017-08-28Make archive policy configurablePradeep Kilambi1-1/+5
Change-Id: I603ce6922130fe32aa1a154df8146ee582bf1a45 (cherry picked from commit b1d7887ce710a98f061100e2878a54c06a5d09e2)
2017-08-26Handle failure of carrier check in configure_safe_defaults()Bob Fournier1-3/+4
Configure_safe_defaults() should handle carrier check failures in the same way as the change that was made to dhcp-all-interfaces.sh in https://review.openstack.org/#/c/419527/. That is, it should ignore failures when cat'ing the carrier file. Change-Id: I100a40835d0ccecee9b4851aae6366c6ab4813a5 Closes-Bug: 1712687 (cherry picked from commit ed976d285caab1858f0b6e74e14a723113d27052)
2017-08-25Enable ceilometer compute agentArx Cruz2-0/+2
This service isn't being started by default and it's required in order to ceilometer collect data about cpu, which is required to run tempest integration tests Closes-Bug: #1713038 Change-Id: I79ba7744db78636fba78e041443148c91e06f940 (cherry picked from commit a2ce6d238cd7e72029fdd6e6364a0501f3bfc835)
2017-08-25Add panko publisher in the event pipelinePradeep Kilambi1-1/+1
Even though panko is deprecated, we still enable it by default. So lets keep it in pipeline as well until its fully dead. Change-Id: Idac89820a66c59b921551857cccae6dbc38241c3 (cherry picked from commit 3dbd5bfe86c2d6864c5678774fc7f910ab846300)
2017-08-25Containarise Barbican APIJanki Chhatbar3-6/+160
This containerises Barbican API in TripleO Change-Id: Icc5e9841ea48c806af4db61cd6de5e9a7a40a988 Partial-Bug: 1668924 Depends-On: I6b5ec18ccdd51b90ff27ff7d4341260dfba71e4e (cherry picked from commit 6d338b809accea4d3ba09ca8363b1a97ed79b658)
2017-08-24Update UPPER_CONSTRAINTS_FILE for stable/pikeOpenStack Release Bot1-1/+1
Change-Id: If1376a7d802d79c2b7533c8f315f47c21f896476
2017-08-24Update .gitreview for stable/pikeOpenStack Release Bot1-0/+1
Change-Id: I62443317bb2a7fbe84f6bb2aa769053b66edb022
2017-08-24Merge "Remove baremetal cron jobs on docker upgrade"Jenkins4-0/+16
2017-08-24Merge "Docker: Enable TLS in the internal network for libvirt"Jenkins2-1/+21
2017-08-24Merge "Specify the start count to 0 for the update step loop"Jenkins1-5/+5
2017-08-24Merge "Do not install additional CentOS packages via ceph-ansible"Jenkins1-0/+1
2017-08-23Merge "More fixes for the Ceph docker images url parsing"Jenkins1-2/+2
2017-08-23Merge "Configure listen_address for libvirtd when TLS is enabled"Jenkins1-0/+2
2017-08-23Do not install additional CentOS packages via ceph-ansibleGiulio Fidente1-0/+1
EPEL is required by the Ceph RPM repo maintained at ceph.com but not by the CentOS SIG repo. The other packages should be already installed in the infra image. This change overrides the list of required packages in ceph-ansible so that it does not install epel-release nor additional unneeded packages [1]. 1. https://github.com/ceph/ceph-ansible/blob/master/group_vars/all.yml.sample#L67 Change-Id: I7b6d2794ebfc0df5b3d5ad9de1d1d55740a38ae0 Closes-Bug: #1712599