summaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2017-09-21Merge "Adds post_upgrade_tasks for any service post-upgrade ansible tasks" ↵Jenkins1-14/+6
into stable/pike
2017-09-21Merge "Make nova patching parameters configurable in Nuage" into stable/pikeJenkins1-0/+12
2017-09-20Adds post_upgrade_tasks for any service post-upgrade ansible tasksmarios1-14/+6
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-19Change to boolean for boolean type paramsTong Liu2-2/+2
Some boolean params are set to string type. Although it works, but it is better to use boolean type for better validation. This patch changes them to boolean type. Change-Id: I9f1d223619ea14fbab26033b24eb1144796e5ef2 Closes-Bug: #1715209 (cherry picked from commit cab8ab1d342c6ffada3f2adea5834b4549240af5)
2017-09-14Make nova patching parameters configurable in NuageLokesh Jain1-0/+12
Nova patching parameters are available in nova.conf but are not configurable from tripleo-heat-templates. Exposing these parameters from Nuage composable services to make them configurable. It enables setting the patching parameters in environment files. This change depends on the addition of nova patching configuration parameters. Change-Id: Iacad25da044f2bac83ee5f577ddcd70650eb61e5 Depends-On: I51ef3e19daff1d98cfe5c2c16475c16e6a3e3e0f (cherry picked from commit f0041153eca8d82bb7f72dc68676cab8448ef037)
2017-09-12Merge "Fixes OpenDaylight updating port status" into stable/pikeJenkins1-0/+1
2017-09-11Add DhcpAgentNotification param to neutron baseTong Liu1-0/+5
Add DhcpAgentNotification param in neutron base yaml file to allow user to toggle dhcp_agent_notification for neutron. Change-Id: I31715f58e885ac0c1cd9d813f79df9906b780d99 Closes-Bug: #1713193 (cherry picked from commit 5ea728cba456f3833a626f86043f17427bca5d4f)
2017-09-11Merge "Add Neutron SR-IOV agent container" into stable/pikeJenkins2-0/+92
2017-09-08Fixes OpenDaylight updating port statusTim Rozet1-0/+1
ODL now uses a websocket port to update the port status to Neutron. This port (8185) was blocked so port updates were never received in Neutron and instances would not come up properly. This patch opens the port for ODL deployments. Closes-Bug: 1715484 Change-Id: Ic59b224c67c02b56b0273700e8e2aa85ae6f8c88 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit e2558c4a665345e67fcc784c21188bdf06ff1126)
2017-09-08Merge "Maintain ceph-osd package only on nodes hosting CephOSD service" into ↵Jenkins1-1/+6
stable/pike
2017-09-07Merge "Add tags in upgrade_tasks for mongodb services." into stable/pikeJenkins1-0/+1
2017-09-07Merge "fluentd: log configuration was not generated correctly" into stable/pikeJenkins1-6/+0
2017-09-07Add tags in upgrade_tasks for mongodb services.Jose Luis Franco Arza1-0/+1
Patch Ie09ce2a52128eef157e4d768c1c4776fc49f2324 added a new set of upgrade tasks which were missing the 'tags' keyword. Closes-Bug: 1715631 Change-Id: Ib1c1aadfbf58c9bccc18667934c8b3c5f38fafa4 (cherry picked from commit 7897d38274cb6435289bc4f4928f96b111e5b4f4)
2017-09-07Add Neutron SR-IOV agent containerBrent Eagles2-0/+92
This patch adds support for running the neutron SR-IOV agent in a container. Depends-On: I4a63845a97c890d7d408731ec5509c320289f18f Depends-On: Ie5d8cd7863c0d042cc6a4e1fc52602d8a03a1935 Depends-On: I1b5ab0a64ae1f5735f1bd5a68e6ae8bdcf47ddec Closes-Bug: #1715388 Change-Id: I7ee603b32eddacd02d846dff00dd1b786d4a7ad9 (cherry picked from commit 94c9c2f954e85de0ab895926a969587b90bc4191)
2017-09-07Merge "Use DeployedSSLCertificatePath for public TLS via certmonger" into ↵Jenkins1-10/+7
stable/pike
2017-09-07Merge "Containerized mongodb, disable by default, fix upgrade" into stable/pikeJenkins1-0/+4
2017-09-07Merge "Change all references of nsx_v3 to nsx." into stable/pikeJenkins1-9/+9
2017-09-07Use DeployedSSLCertificatePath for public TLS via certmongerJuan Antonio Osorio Robles1-10/+7
As described in the bug report, DeployedSSLCertificatePath is used by the TLS injection script (if you decide to use that). There is an alternative, which is to use FreeIPA to provide the certificate for public TLS (powered by certmonger); however, it doesn't use the same path as what folks expected. This reuses the DeployedSSLCertificatePath parameter and uses that as a path for the resulting PEM file, so its easier to debug. Change-Id: If73c9599d8b94d2f02b8e4c48f4a235e0fea764d Closes-Bug: #1714932 (cherry picked from commit f395d9eab2277061e926f7956bb3a56b0c7b1131)
2017-09-07Maintain ceph-osd package only on nodes hosting CephOSD serviceAlan Bishop1-1/+6
The ceph-osd package is only required on nodes hosting the CephOSD service, but the package's presence on other nodes may interfere with software updates. That's because some distros distribute Ceph software in different channels, and not all nodes have access to the ceph-osd channel. There are two parts to the fix, and the first is an enhancement to the yum update process. The process detects when the ceph-osd package is not required, and removes the package from the node. The second part takes ceph-osd out of the default list of packages needed by puppet-ceph. The ceph-osd package is listed only on the nodes hosting the CephOSD service. Closes-Bug: #1713292 Change-Id: I7a581518ed25cf5f264abfaabfcf2041363a065b (cherry picked from commit 5a89ea21f2add98119a10464b020a98999d31c41)
2017-09-07fluentd: log configuration was not generated correctlyLars Kellogg-Stedman1-6/+0
fluentd hiera elements were being set in all_nodes.json, but then were overwritten by values in <role>.json (e.g., controller.json). This commit removes the values from all-nodes.json and ensures that they are set correctly in <role>.json. Closes-Bug: #1713240 Change-Id: I2b4c74c2a807f8e2fed57112f06b3791701bbe95 (cherry picked from commit d9db0c5f4f0fb07832e54b1c7fd7f5c8bfd4134e)
2017-09-06Merge "Add param to configure snat mechanism" into stable/pikeJenkins1-0/+9
2017-09-06Merge "TLS proxy for redis" into stable/pikeJenkins3-2/+70
2017-09-06Change all references of nsx_v3 to nsx.Jay Jahns1-9/+9
Change-Id: I31c49926b0ba93f79db3d778c574bd9a480e70cd Closes-Bug: #1713193 Depends-On: Id73f675844b0df2eafa45507d1c28f16cd0b15b2
2017-09-06Add param to configure snat mechanismJanki Chhatbar1-0/+9
Add a parameter to configure SNAT mechanism in OpenDayLight defaulting to conntrack for OVS and defaulting to controller mechanism for OVS-DPDK Change-Id: I48c6f07de55cb2574cc3a7e9653b812f875df726 Closes-Bug: #1710614 (cherry picked from commit 9a450a8e505b5d7ccef7e5e7675573da2a4cd42c)
2017-09-06Merge "Rabbitmq: Enable Erlang distribution TLS" into stable/pikeJenkins1-0/+1
2017-09-06Merge "Add support for Dell EMC Isilon Manila backend" into stable/pikeJenkins1-0/+72
2017-09-06TLS proxy for redisMartin André3-2/+70
Redis does not have TLS out of the box. Let's use a proxy container for TLS termination. bp tls-via-certmonger Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: Ie2ae0d048a71e1b1b4edb10c74bc0395a1a9d5c9 Depends-On: I078567c831ade540cf704f81564e2b7654c85c0b Depends-On: Ia50933da9e59268b17f56db34d01dcc6b6c38147 (cherry picked from commit c2a93cf4c5d9d6b5ee0536380751a7a9540927cc)
2017-09-06Containerized mongodb, disable by default, fix upgradeSteve Baker1-0/+4
This change removes the entry to containerise docker by default because it should now be disabled since the change Id2e6550fb7c319fc52469644ea022cf35757e0ce. Removing the entry means the default mapping to mongodb-disabled.yaml takes effect. This change also modifies the upgrade_tasks so that the mongod service is only disabled when the service exists. There appears to be upgrade scenarios which fail because mongodb was never installed in the first place. Change-Id: Ie09ce2a52128eef157e4d768c1c4776fc49f2324 Closes-Bug: #1715031 (cherry picked from commit cb81cbe3b5f3887f5d690c590e52b728f74d43c3)
2017-09-06Merge "Add support for Dell EMC VMAX Manila Backend" into stable/pikeJenkins1-0/+74
2017-09-06Merge "manila: set "neutron_admin_auth_url" correctly" into stable/pikeJenkins1-1/+1
2017-09-06Allow upgrade tasks to run when looping through stepsMarius Cornea1-2/+2
Currently for non controller upgrades we're looping through the upgrade steps and run the upgrade tasks based on when conditionals including the step number and the existing upgrade task condition. Some of tasks fail because the variables used in when conditionals are not available through all steps. This change adds default values to these vars where possible or creates them for all steps to avoid failures. Related-Bug: 1708115 Change-Id: I5c731043cec8e31fc82ca98972a301baa7294c4f (cherry picked from commit e2f00ef1dc98140087c81e202a520f549f9a0970)
2017-09-05Add support for Dell EMC Isilon Manila backendrajinir1-0/+72
This change adds support for manila::backend::dellemc_isilon Change-Id: I92592e4b717d4b1812ccd810ec1daaedd181c3dd Implements: blueprint dellemc-isilon-manila (cherry picked from commit f6c9906d51fb3268b7a7d61d53181ab5d3c0d2ec)
2017-09-05Add support for Dell EMC VMAX Manila Backendrajinir1-0/+74
This change adds support for manila::backend::dellemc_vmax Change-Id: I92e189c8741c496ef6c27130f73829c327a99f1b Implements: blueprint dellemc-vmax-manila (cherry picked from commit 04daabdc8414e4435dc4cd3ccfea9a62b5631261)
2017-09-05Rabbitmq: Enable Erlang distribution TLSJuan Antonio Osorio Robles1-0/+1
This will be used for the replication traffic as specified in the dependent commit. bp tls-via-certmonger Change-Id: Ia53b9edaa6c6cdd48bcdde64969ae6c16f57ae41 Depends-On: I265c89cb8898a6da78a606664a22c50f5e57a847 (cherry picked from commit 1b4df60ac780a8388f5421c3c1634d172886595f)
2017-09-05manila: set "neutron_admin_auth_url" correctlyTom Barron1-1/+1
It was being set using NeutronAdmin endpoint but it is an authorization url. Set it using KeystoneInternal endpoint. Change-Id: I23f4a895628ac909a1fe1f93cecefa84f25858b1 Closes-Bug: #1712908 (cherry picked from commit 7380183cf590b74f5ad84bb40a8afa08979c235b)
2017-09-04Merge "Configure Zaqar trust notifier" into stable/pikeJenkins1-0/+3
2017-09-04Merge "Use list_concat in place of yaql" into stable/pikeJenkins11-264/+231
2017-09-02Merge "Add support for Dell EMC VMAX ISCSI Backend" into stable/pikeJenkins1-0/+65
2017-09-02Add support for Dell EMC VMAX ISCSI Backendrajinir1-0/+65
This change adds a new define for cinder::backend::dellemc_vmax_iscsi Change-Id: I7c685e0a3186da138964f17b487fb0c3533f58c7 Implements: blueprint dellemc-vmax-isci (cherry picked from commit c77189905525c6fe834e001f2231b9eab788cd01)
2017-09-02Configure Zaqar trust notifierThomas Herve1-0/+3
Change-Id: Id7d5967370a5d3fa0183359349f502f32a0109da (cherry picked from commit e1b1b5654d70c4a38be340070648d0fb7932bcc8)
2017-09-02Use list_concat in place of yaqlThomas Herve11-264/+231
Where applicable, use list_concat instead of yaql to build new lists: it should be more resilient to errors, easier to debug, and less expensive. Change-Id: I6d3dbc7ee8eac50f46023a35af4ec7f2d378fd87 Related-Bug: #1714005 (cherry picked from commit 8008089de24437757d3ba10299bb1041b4aa627a)
2017-09-02NetworkDeploymentActions shall be made role specificKarthik S1-1/+14
In case of an OSP upgrade, some of the roles may require the reconfiguration of network via os-net-config, especially with roles having DPDK nics. In order to facilitate this configuration per role, the THT parameter 'NetworkDeploymentActions' is made role specific. Change-Id: I17a1812cf9e1c60fb893bf36dc99ab3ec5fc7250 (cherry picked from commit 88711c3b800257f6b333157eb3dfc8f4e7003a46)
2017-08-31Move deprecated SchedulerHints logic to overcloud.j2.yamlSteven Hardy1-13/+2
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/pikeJenkins1-0/+75
2017-08-31Merge "Add support for Dell EMC Unity Manila Backend" into stable/pikeJenkins1-0/+74
2017-08-31Merge "Change ManageEventPipeline to true" into stable/pikeJenkins1-1/+1
2017-08-30Add support for Dell EMC VNX Manila Backendrajinir1-0/+75
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 Backendrajinir1-0/+74
This change adds support for manila::backend::dellemc_unity Change-Id: Idec67d190b12359e8e6f1c157577088fa84ef41d Implements: blueprint dellemc-unity-manila (cherry picked from commit c5ee7b7714c712807f33ca1645186d33103a2264)
2017-08-30Change ManageEventPipeline to truePradeep Kilambi1-1/+1
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-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)