summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-03-09Merge "Enable Docker service for Compute role"Jenkins2-21/+6
2017-03-09Merge "Set number of Swift proxy server workers to auto"Jenkins1-2/+2
2017-03-09Merge "sahara: configure keystone_authtoken parameters"Jenkins2-3/+9
2017-03-09Merge "barbican: Use versionless keystone endpoints"Jenkins1-3/+3
2017-03-08sahara: configure keystone_authtoken parametersEmilien Macchi2-3/+9
Configure keystone_authtoken for Sahara service. Change-Id: I045b7d1d52851ab0d532a8524fcea95705e3db78 Partial-implement: blueprint keystone-v3
2017-03-08Merge "Remove the openvswitch special case upgrade code"Jenkins2-9/+9
2017-03-08barbican: Use versionless keystone endpointsJuan Antonio Osorio Robles1-3/+3
This also moves the explicit usages of the Keystone V3 endpoint fromt he EndpointMap, as using the uri_no_suffix defeats that usage. Change-Id: I5f07a0cee07fa28b88c419e25e014094004b1bce Partial-Implement: blueprint keystone-v3
2017-03-08Enable Docker service for Compute roleMartin André2-21/+6
A recent commit [1] change how docker is installed and configured on the overcloud nodes, from a cloud-init script to a proper puppet profile in puppet-tripleo but forgot to enable the docker service on the compute nodes. [1] Ia50169819cb959025866348b11337728f8ed5c9e Change-Id: I202723d0e48f110e5b0dbfe3dcf6646da9f37948
2017-03-07Merge "sshd template, rename hiera key"Jenkins1-1/+1
2017-03-07Add puppet_config to docker neutron-l3 serviceDan Prince1-7/+11
This patch makes the neutron-l3 docker service adhere to the new puppet_config interface. Change-Id: If5b73ec90637e878af55c8404d1eff8c18e857c3
2017-03-07Merge "Enable keystone cadf notifications"Jenkins2-0/+7
2017-03-07sshd template, rename hiera keySteven Hardy1-1/+1
This means we can remove the special BannerText hiera reference in the puppet-tripleo profile Change-Id: Id4c8b853fa0e9bcdffe2cf7cd1554a9be7451b25
2017-03-07Merge "Enable composable upgrades for docker service templates"Jenkins33-328/+476
2017-03-07Merge "Add docker composable service template"Jenkins1-0/+43
2017-03-07Merge "Adds upgrade tasks for OpenDaylight services"Jenkins2-0/+37
2017-03-07Merge "Overwrite nova placement with stub for docker"Jenkins1-0/+6
2017-03-06Merge "Fix a typo"Jenkins1-2/+2
2017-03-06Merge "Cinder-api upgrade: use httpd instead of apachectl"Jenkins1-1/+1
2017-03-06Enable keystone cadf notificationsYolanda Robla2-0/+7
It will allow to configure keystone event notifications using CADF, as documented on: https://docs.openstack.org/developer/keystone/event_notifications.html CADF events provide auditing capabilities for compliance with security. Change-Id: Id16b264c295b9e3adbf960366ff8328ba8dcd485
2017-03-06Enable composable upgrades for docker service templatesSteven Hardy33-328/+476
This aligns the docker based services with the new composable upgrades architecture we landed for ocata, and does a first-pass adding upgrade_tasks for the services (these may change, atm we only disable the service on the host). To run the upgrade workflow you basically do two steps: openstack overcloud deploy --templates \ -e environments/major-upgrade-composable-steps-docker.yaml This will run the ansible upgrade steps we define via upgrade_tasks then run the normal docker PostDeploySteps to bring up the containers. For the puppet workflow there's then an operator driven step where compute nodes (and potentially storage nodes) are upgrades in batches and finally you do: openstack overcloud deploy --templates \ -e environments/major-upgrade-converge-docker.yaml In the puppet case this re-applies puppet to unpin the nova RPC API so I guess it'll restart the nova containers this affects but otherwise will be a no-op (we also disable the ansible steps at this point. Depends-On: I9057d47eea15c8ba92ca34717b6b5965d4425ab1 Change-Id: Ia50169819cb959025866348b11337728f8ed5c9e
2017-03-06Add docker composable service templateSteven Hardy1-0/+43
This uses a puppet-tripleo profile to configure and start docker in step1 of the deployment, which is before we attempt to deploy any containers (see docker/services/README.rst#docker-steps) This enables existing environments on upgrade to configure things correctly, without using the docker/firstboot/setup_docker_host.sh - the firstboot approach may still be needed for atomic, but for environments where we can run puppet on the host this integrates more cleanly with our existing architecture I think. Depends-On: Id8add1e8a0ecaedb7d8a7dc9ba3747c1ac3b8eea Change-Id: If4ffe21579bcb2770f4e5a96be7960b52927a27b
2017-03-06Merge "Make neutron dhcp agents per network conditional"Jenkins2-16/+31
2017-03-06Merge "Use the new hiera hook in all remaining templates"Jenkins7-160/+153
2017-03-06Cinder-api upgrade: use httpd instead of apachectlJuan Antonio Osorio Robles1-1/+1
It doesn't work downstream, so the httpd command was recommended. Change-Id: I4807333b80dad10f16e5deb56cbfdda656cd1e50
2017-03-06Merge "ec2-api: Get FQDN from hiera instead of puppet fact"Jenkins1-2/+2
2017-03-06Merge "Removes old environment file references"Jenkins1-13/+0
2017-03-06Merge "Put docker puppet config in puppet_config dict"Jenkins34-180/+261
2017-03-06Use the new hiera hook in all remaining templatesmarios7-160/+153
The new hiera hook in I21639f6aadabf9e49f40d1bb0b1d0edcfc4dbc5e was added to most of the tripleo-heat-templates in Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1 The new hook is installed by default if you use tripleo-common Ia1864933235152b7e899c4442534879f8e22240d and will be installed as part of the Newton to Ocata upgrades workflow in I0c7a32194c0069b63a501a913c17907b47c9cc16 In order to use the new hiera data as part of the upgrade we need to remove the old hieradata which will break anyone still defining and using it. This change updates the remaining vendor plugin manifests to use the new hiera hook. The pre-requisite is that the new hook is installed on their overcloud (as above it comes if you follow the N..O upgrade) Change-Id: Ic95154734cb21e6b941c7f1569295b413963831d
2017-03-04Merge "etcd: Get FQDN from hiera instead of puppet fact"Jenkins1-1/+1
2017-03-03Merge "Fix httpd dir create to not error if exists"Jenkins1-1/+1
2017-03-03Merge "Fix Panko API upgrade process"Jenkins1-1/+5
2017-03-03Removes old environment file referencesChristopher Brown1-13/+0
ODL-l3 env file was removed in commit 7163746 manage-firewall was removed in commit 2064ab8 as this was enabled by default Change-Id: I8ed8d4ed5bf709f2ac581adfaacc24a7582f13bd
2017-03-03Fix httpd dir create to not error if existsPradeep Kilambi1-1/+1
In cases where /var/log/httpd already exists, this exits with error code 1. $ sudo docker logs keystone-init-log mkdir: cannot create directory '/var/log/httpd': File exists Change-Id: I62bf08d9fc9e02d5f3016bd14bb0a090b76ac837
2017-03-03Merge "Enable IronicPxe in the undercloud"Jenkins1-0/+1
2017-03-03Merge "Removes opencontrail reference"Jenkins1-5/+0
2017-03-03etcd: Get FQDN from hiera instead of puppet factJuan Antonio Osorio Robles1-1/+1
The puppet facts will be removed soon and using the hiera value is adviced instead. Change-Id: I318f81abaac997370e950780993dc95cae088327
2017-03-03ec2-api: Get FQDN from hiera instead of puppet factJuan Antonio Osorio Robles1-2/+2
The puppet facts will be removed soon and using the hiera value is adviced instead. Change-Id: I3ba89dd9bd471c5723325efc9041ca6da937ccc5
2017-03-03Remove the openvswitch special case upgrade codemarios2-9/+9
Removed from the tripleo_upgrade_node.sh (major upgrade) & yum_update.sh (minor update). The workaround is no longer needed and in fact has the opposite effect killing connectitivity to the node. The 'normal' yum update on nodes delivers the latest openvswitch 2.6.1 with no drama. Also adds a 'complete' message, some extra debug echo for logs and removes the python-zaqarclient install no longer needed Closes-Bug: 1669714 Change-Id: Icd1517bcade36781fa0da21d045ffd9ec68efc38
2017-03-02Fix Panko API upgrade processEmilien Macchi1-1/+5
Upgrade process wasn't consistent and correct. Change-Id: Id1f810d33c2909957be9a2c96d18c96dee939953
2017-03-02Merge "Make UpdateDeployment depend on NetworkDeployment"Jenkins6-0/+6
2017-03-02Overwrite nova placement with stub for dockerDan Prince1-0/+6
This updates kolla config to overwrite the stock version with the puppet-nova generated mock. Depends-On: Ie16a60c604ecf9f4012b0630f91e6ece2b6855db Change-Id: I320f024adc88102ea24c0212702fe2dce826874f Closes-bug: #440612
2017-03-02Enable IronicPxe in the undercloudDan Prince1-0/+1
This enables the IronicPxe services which are split out into separate templates for the containerized undercloud. Change-Id: I0ec3cefec9b47ef3c59de6972541ef9b560aacb7
2017-03-02Merge "Add plan-environment.yaml"Jenkins2-0/+7
2017-03-02Removes opencontrail referenceChristopher Brown1-5/+0
The opencontrail environment file was removed in commit da91bb6 so this is no longer required Change-Id: I835dc665ede7fdb50d5be2c3251b8acf20c3ce37
2017-03-02Merge "Add upgrade task for panko api"Jenkins1-5/+14
2017-03-02Merge "Upgrades: fix up the rabbitmq HA mode like in new ocata deployments"Jenkins1-0/+29
2017-03-02Add upgrade task for panko apiPradeep Kilambi1-5/+14
Change-Id: Icc5fbf99301ae47344e1582767e1e7a4687f491b
2017-03-02Merge "Add mistral service support for composable upgrades"Jenkins3-0/+57
2017-03-02Merge "upgrades/validation: only run validation when services exist"Jenkins36-5/+270
2017-03-02Upgrades: fix up the rabbitmq HA mode like in new ocata deploymentsMichele Baldessari1-0/+29
In ocata we changed the rabbitmq ha policy to "ha-exactly" via the following changes: - tht: Iace6daf27a76cb8ef1050ada0de7ff1f530916c6 - puppet-tripleo: Ib62001c03e1e08f58cf0c6e0ba07a8879a584084 We took care of the upgrade path via I3a97505d2ae1ae27f3080ffe74c33fdabffd2420 With the move to the ansible-based composable upgrades we left this change out. And now an upgraded environment has the following policy: - Upgraded environment Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}" - New environment Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"exactly","ha-params":2}" We need to add this pcs resource change to the our upgrade scripts. Change-Id: I3c4113c207e9d0c45be43df7c2379ac26cb60692 Closes-Bug: #1668600