aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-02-18Merge "Switch to net-config-multinode"Jenkins4-8/+8
2017-02-18Merge "Install nova-placement package on upgrade"Jenkins1-0/+5
2017-02-17Make the DB URIs host-independent for all servicesMichele Baldessari32-43/+65
When fixing LP#1643487 we added ?bind_address to all DB URIs. Since this clashes with Cellsv2 due to the URIs becoming host dependent, we need a new approach to pass bind_address to pymysql that leaves the DB URIs host-independent. In change Iff8bd2d9ee85f7bb1445aa2e1b3cfbff1f397b18 we first create a /etc/my.cnf.d/tripleo.cnf file with a [tripleo] section with the correct bind-address option. In this change we make sure that the DB URIs will point to the added file and to the specific section containing the necessary bind-address option. We do introduce a new MySQLClient profile which will hold all this more client-specific configuration so that this change can fit better in the composable roles work. Also, in the future it might contain the necessary configuration for SSL for example. Note that in case the /etc/my.cnf.d/tripleo.cnf file does not exist (because it is created via the mysqlclient profile), things keep on working as usual and the bind-address option simply won't be set, which has no impact on hosts where there are no VIPs. Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com> Change-Id: Ieac33efe38f32e949fd89545eb1cd8e0fe114a12 Related-Bug: #1643487 Closes-Bug: #1663181 Closes-Bug: #1664524 Depends-On: Iff8bd2d9ee85f7bb1445aa2e1b3cfbff1f397b18
2017-02-17Merge "Add docker_puppet_tasks initialization on primary node"Jenkins4-5/+79
2017-02-17Sort 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
2017-02-17Add environment for deployed-server with pacemakerJames Slagle1-0/+4
A new environment file to be used when using the deployed-server roles data at deployed-server/deployed-server-roles-data.yaml. This ensures the Pre and Post Puppet Tasks for the ControllerDeployedServer role are mapped to the stacks that handle maintenance mode and resource restarts for pacemaker on stack-update. Change-Id: I1ca52dfb3a3b669e128ebb0a28d9e36a1807faad Closes-Bug: #1665060
2017-02-17Generate Pre/Post Puppet Tasks for all rolesJames Slagle2-13/+11
We need to generate the Pre and Post Puppet Tasks for all roles, not just the Controller role. Otherwise, you have to have a role specifically named Controller that is running your pacemaker services, or pacemaker won't be properly handled on stack-updates. When using deployed-server's it's actually not possible to have a role called Controller, since we need to use all custom roles so that we can set disable_contraints on each role. Further, it is not possible to redefine the Controller role since puppet/controller-role.yaml is listed in the excludes file. Change-Id: I737b24db90932e292b50b122640f66385f2d1c23 Partial-Bug: #1665060
2017-02-17Don't assume default network names in net_ip*mapSteven Hardy3-52/+212
This needs to handle a ServiceNetMap containing non-default network names when they are overridden via the *NetName parameters. Closes-Bug: #1651541 Change-Id: I95d808444642a37612a495e822e50449a7e7da63
2017-02-17Switch to net-config-multinodeEmilien Macchi4-8/+8
Because of this bug: https://bugs.launchpad.net/tripleo/+bug/1661412 We are unable to upgrade from Newton. Until we figure this out, let's re-enable the previous SoftwareConfig. Change-Id: I966b96c50224656b152045c97aa23b9495618a18
2017-02-17Merge "Add explicit swift check to tripleo_upgrade_node.sh"Jenkins1-4/+11
2017-02-17Merge "Deploy Manila with CephMDS in scenario004"Jenkins3-8/+43
2017-02-17Install nova-placement package on upgradeSteven Hardy1-0/+5
This doesn't exist in newton images, so install it via the ansible tasks during step3 (when all other packages are updated). Change-Id: I08fb7855b910ccc5a8ab2d73f1de15b695784abd Closes-Bug: #1664265
2017-02-17Merge "Apply puppet in non-controller script in step."Jenkins3-3/+36
2017-02-17Merge "docker: new hybrid deployment architecture and configuration"Jenkins16-320/+577
2017-02-17Merge "Apply post-upgrade step to not run puppet in post upgrade"Jenkins1-1/+1
2017-02-17Merge "Add Newton to Ocata UpgradeInitCommonCommand"Jenkins8-1/+66
2017-02-17Merge "Adds 'trunk' to ODL env service plugins"Jenkins1-1/+1
2017-02-17Merge "Automatically backup and restore Swift rings from the undercloud"Jenkins4-0/+94
2017-02-16Add OpenDaylightConnectionProtocol parameter to opendaylight-api serviceFeng Pan1-0/+5
OpenDaylightConnectionProtocol is currently only set in opendaylight-ovs service, it needs to be set in opendaylight-api when Opendaylight is deployed with another vswitch like VPP. Closes-Bug: #1665442 Change-Id: Ib20cacd5b15586f96c880ed5a371e7e3c85a7a8c Signed-off-by: Feng Pan <fpan@redhat.com>
2017-02-16Update ci environment for multinode jobs to support CephGiulio Fidente1-0/+6
Adds the CephMon and CephOSD services on the Controller role so that we can test Ceph if the services are enabled via registry. Change-Id: I73ee5380b88bf7643ba425a0c833922e330ecade
2017-02-16Add missing releasenotes for Swift ring managementChristian Schwede1-0/+9
Change-Id: Ifef3e6f661d0094ebcc587fd6c1d0783a92ada3f
2017-02-16Apply post-upgrade step to not run puppet in post upgradeMathieu Bultel1-1/+1
In the environment file: environments/major-upgrade-composable-steps.yaml we don't want to run puppet in certains roles in post upgrade because we need to make some extra tasks on this nodes and run puppet on converge step Change-Id: I38fc5772cdb4a7df7979beb2e7475c70f34076a7
2017-02-16Merge "Update reno for stable/ocata"Jenkins2-0/+7
2017-02-16Merge "CI fix broken references to multinode-core.yaml"Jenkins2-2/+37
2017-02-16Update reno for stable/ocataOpenStack Release Bot2-0/+7
Change-Id: I4e68d566c7d52df850de41cb207f523ccb029c3f
2017-02-16Merge "Configuring a default ntp server."Jenkins2-2/+10
2017-02-16Merge "Remove unused nova_url from neutron config"Jenkins1-2/+0
2017-02-16Merge "Remove deprecated metering_secret"Jenkins1-1/+0
2017-02-16Merge "Add release notes for the HA-by-default change"Jenkins1-0/+5
2017-02-16Align HCI environment file with list of services from roles_dataGiulio Fidente1-0/+3
Until we get bug #1635409 fixed we'll have to keep the two lists in sync. Change-Id: Ifd996bd4c95f901f242696b37e179073be6334d0 Related-Bug: #1635409
2017-02-16Merge "OVN bridge mappings for tripleo"Jenkins1-0/+11
2017-02-16Add Newton to Ocata UpgradeInitCommonCommandmarios8-1/+66
This adds the UpgradeInitCommonCommand for newton..ocata common UpgradeInit commands. This comes before the ansible upgrade steps so we need to do things like remove the old newton hieradata and install the ansible-pacemaker module and ansible heat-agent plugin This defaults to '' and is set in the major-upgrade-composable-steps and unset in the major-upgrade-converge environment files. Change-Id: I0c7a32194c0069b63a501a913c17907b47c9cc16
2017-02-16Merge "Add major-upgrade-converge environment."Jenkins1-0/+6
2017-02-16CI fix broken references to multinode-core.yamlSteven Hardy2-2/+37
This isn't needed for the single-node upgrade test, but it is required for the 3-nodes job (which won't work because the referenced file doesn't currently exist). Change-Id: I78bd5c804284219a71b13dba21fd1188ca854fca
2017-02-15Enable docker services in the registryDan Prince1-0/+30
This patch avoids conflicts when cherry picking docker services in our ad-hoc docker services patch series and enables them all at once. Change-Id: Ia4f7c8071d8b4f3c9a7d73173e9120eb1e79ce53
2017-02-15Merge "Release notes ha composable"Jenkins1-0/+12
2017-02-15Merge "Setup FreeIPA to serve DNS in the setup script"Jenkins1-1/+3
2017-02-15Merge "Add nova service support for composable upgrades"Jenkins10-5/+163
2017-02-15Add major-upgrade-converge environment.Steven Hardy1-0/+6
This is a generic replacement for the previous pacemaker named file that is designed to work with the new composable-steps upgrade. Change-Id: If5016b910931364a621b280465420d0bf2617895 Partially-Implements: blueprint overcloud-upgrades-per-service
2017-02-15Add docker ironic servicesDan Prince3-0/+341
This patch adds docker services for Ironic API and Ironic Conductor. Change-Id: Icea5ae2ecd7e749ce95ed8444c3a5ef3e035bb4e
2017-02-15Add docker_puppet_tasks initialization on primary nodeDan Prince4-5/+79
This patch adds a new (optional) section to the docker post.j2.yaml that collects any 'docker_puppet_tasks' data from enabled services and applies it on the primary role node (the first node in the primary (first) role). The use case for this is although we are generally only using puppet for configuration there are several exceptions that we desire to make use of today for parity with baremetal. This includes things like database creation and keystone endpoint initialization which we rely on configuration via hiera variables controlled by the puppet services. Change-Id: Ic14ef48f26de761b0d0eabd0e1c0eae52d90e68a
2017-02-15Add docker keystone serviceDan Prince1-0/+153
Depends-On: Icabdb30369c8ca15e77d169dc441bee8cfd3631f Change-Id: Icec07f75f81953c4bf81ca21b4b02bc02e157562 Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Ian Main <imain@redhat.com>
2017-02-15docker: new hybrid deployment architecture and configurationDan Prince16-320/+577
This patch implements a new docker deployment architecture that should us to install docker services in a stepwise manner alongside of baremetal puppet services. This works by using Yaql to select docker specific services (docker/services/*.yaml) vs the puppet specific ones and then applying the selected Json to relevant Heat software deployments for docker and baremetal puppet in a stepwise fashion. Additionally the new architecture leverages new composable services interfaces from Newton to allow configuration of per-service container configuration sets (directories that are bind mounted into kolla containers) by using the Kolla containers themselves. It does this by spinning up a throw away "configuration only" version of the container being configured itself, then running the puppet apply in that container and copying the generated config files into /var/lib/config-data. This avoids having to install all of the OpenStack dependency packages in the heat-agent-container itself (our previous approach) and should allow us to configure a much wider variety of container config files that would otherwise be impossible with the previous shared approach. The new approach (combined) should allow us to configure containers in both the undercloud and overcloud and incrementally add CI coverage to services as we containerize them. Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Ian Main <imain@redhat.com> Co-Authored-By: Flavio Percoco <flavio@redhat.com> Change-Id: Ibcff99f03e6751fbf3197adefd5d344178b71fc2
2017-02-15Add explicit swift check to tripleo_upgrade_node.shmarios1-4/+11
And change the conditional to use hiera instead. Change-Id: Icf91dd91c0ab04e7919172fcfd130183bfd427b4
2017-02-15Apply puppet in non-controller script in step.Sofer Athlan-Guyot3-3/+36
We want to apply a puppet manifest for the non-controller role, but we need to apply it in stages. By loading the proper hieradata we get the needed step configuration. Change-Id: I07bfeee7b7d9a9b8c2c20e5d5c9ed735d0bfc842 Closes-Bug: #1664304
2017-02-15Merge "Containers: Add required EndpointMap parameter"Jenkins1-1/+5
2017-02-15Setup FreeIPA to serve DNS in the setup scriptJuan Antonio Osorio Robles1-1/+3
This is needed for the overcloud nodes to automatically get their domain and to autodiscover the FreeIPA server. Change-Id: I4c055e4b4086b02fa706380f01911f499966dfc1
2017-02-15Merge "OVN plugin configuration fixes"Jenkins3-13/+28
2017-02-15Declare variables for freeipa_setup.sh scriptJuan Antonio Osorio Robles1-0/+9
These were assumed to be always passed, but as the script gets different cases (novajoin vs pre-defined service principals) we might get "unbound variable" errors when used outside of CI. Exporting these variables beforehand prevents that. Change-Id: I195321354df167c09cfc87c5b9f86c6dc5026d75
2017-02-15Merge "Add Ceph RGW to capabilities map"Jenkins1-0/+10