summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-04-24Merge "Merge pre|post puppet resources into pre|post config."Jenkins13-44/+30
2017-04-24Merge "Fix containerized RabbitMQ service deployment"Jenkins1-3/+16
2017-04-24Merge "Don't attempt to configure live migration"Jenkins2-2/+18
2017-04-24Merge "Run Zaqar with httpd in puppet service"Jenkins2-12/+57
2017-04-24Merge "Remove no longer used environment files - older upgrade workflows"Jenkins6-37/+0
2017-04-24Merge pre|post puppet resources into pre|post config.Carlos Camacho13-44/+30
The [Pre|Post]Puppet resources were renamed in https://review.openstack.org/#/c/365763. This was intended for having a pre/post deployment steps using an agnostic name instead of being attached to a technology. The renaming was unintentionally reverted in https://review.openstack.org/#/c/393644/ and https://review.openstack.org/#/c/434451. This submission merge both resources into one, and remove the old pre|post hooks. Closes-bug: #1669756 Change-Id: Ic9d97f172efd2db74255363679b60f1d2dc4e064
2017-04-24Fix containerized RabbitMQ service deploymentBogdan Dobrelya1-3/+16
* Use default puppet tags instead of the 'file' tag only * Noop user/policy providers for puppet_config docker step and move them into docker_puppet_tasks (init container) Change-Id: I98a54808aae6fca060b23f074b71178f2d4c815e Closes-bug: #1684138 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
2017-04-24Merge "Allow configuring enabled hardware types for Ironic"Jenkins2-0/+15
2017-04-24Merge "Containers: disable downloading rabbitmqadmin"Jenkins1-1/+4
2017-04-22Merge "Replace six.iteritems() with .items()"Jenkins1-1/+1
2017-04-22Merge "Increase documentation about parameters"Jenkins2-3/+33
2017-04-21Merge "Add service config settings to agent services"Jenkins3-0/+6
2017-04-21Merge "scenario001/pingtest: enable Gnocchi resource again"Jenkins1-15/+13
2017-04-21Remove no longer used environment files - older upgrade workflowsmarios6-37/+0
In I7831d20eae6ab9668a919b451301fe669e2b1346 we removed some of the old upgrades but left the environment files removed here. Change-Id: Ib3eca5687285b280832d19b647c3b4aa3d9ac36d
2017-04-21Don't attempt to configure live migrationJiri Stransky2-2/+18
When configuring nova containers via puppet, the puppet class chain includes a class for live migration, which configures live migration aspects in nova and libvirt. Some of the libvirt config parts try to notify Service[libvirt], but that service definition is only included in nova-libvirt service, it's not included in the control plan nova services. However, our hieradata is currently global on the node, it's not per-service, which means even though only nova-compute and nova-libvirt service set tripleo::profile::base::nova::manage_migration: true this hiera setting is applied to all containers running puppet, most notably the ones which configure nova control plane services. As a result, configuration of nova control plane services failed, and in turn the whole deployment failed. This commit disables the libvirt part of live migration config until we implement some better solution (e.g. hieradata separation between different puppet containers, or move the libvirt config parts only to nova-compute manifests in puppet-tripleo). Change-Id: I0328406607d451e6bdce4d92c441c03648925fa7 Closes-Bug: #1684107
2017-04-21Merge "Use -net=host for docker-puppet.py config gen"Jenkins1-0/+4
2017-04-21Merge "Add defaults for docker puppet tasks"Jenkins1-4/+10
2017-04-21Merge "containers: TLS in the internal network for telemetry services"Jenkins4-0/+65
2017-04-21Merge "glance: deploy services with Keystone v3 endpoints"Jenkins2-2/+9
2017-04-21Merge "SSHD Service extensions"Jenkins11-4/+46
2017-04-21Merge "Use conditionals for neutron and glance worker defaults"Jenkins2-10/+20
2017-04-21Merge "Add network_data.yaml to encapsulate list of networks for j2"Jenkins5-54/+76
2017-04-21Merge "Add environment to preselect only VIP IP addresses"Jenkins5-1/+55
2017-04-21Merge "Add NeutronDnsDomain heat option, undercloud fix"Jenkins2-0/+6
2017-04-20Merge "Add all hosts to HostsEntry output"Jenkins2-1/+10
2017-04-20Merge "N->O Manual puppet commands have the right modulepath."Jenkins2-2/+5
2017-04-20Add defaults for docker puppet tasksSteven Hardy1-4/+10
Currently we're referencing some steps that don't exist in the output from the OS::Heat::Value resource, but as noted in the heat bug #1681749 I think this isn't valid and probably should not be allowed, so instead merge defaults with the non-empty step tasks. To avoid further duplication of the loop variables, I made the max step a variable. Change-Id: Icf3d639b53c97006a0c370c12600449fba6f3323 Related-Bug: #1681749
2017-04-20N->O Manual puppet commands have the right modulepath.Sofer Athlan-Guyot2-2/+5
In two places during upgrade we manually trigger puppet. There can be a problem when new puppet modules are added, and their corresponding symlinks in /etc/puppet/modules are not created during the installation as their are installed in /usr/share/openstack-puppet/modules. To prevent the issue tripleo set modulepath in the templates. We must use the same modulepath to make sure that we don't fail because of missing module in the manual puppet run. This particulary happens when you upgrade from M->N->O, as the base image in Mitaka doesn't have the proper symlinks and they are not created during the installation of the package. Closes-Bug: #1684587 Change-Id: I79df6ea33f1c58e13309176a6de41b7572541fd6
2017-04-20Merge "TLS-everywhere: Enable for TLS libvirt live migration"Jenkins2-0/+88
2017-04-20Run Zaqar with httpd in puppet serviceThomas Herve2-12/+57
This switches Zaqar to run with httpd when configured by puppet. Change-Id: I69b923dd76a60e9ec786cae886c137ba572ec906
2017-04-20Merge "N->O upgrade, fix wrong parameters to nova placement."Jenkins1-1/+2
2017-04-20Merge "Pluggable server type per Role"Jenkins8-6/+17
2017-04-20glance: deploy services with Keystone v3 endpointsEmilien Macchi2-2/+9
* Switch auth_uri to point to Keystone versionless endpoint. * Switch Swift auth url to use Keystone versionless endpoint and Keystone v3 API. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: I78cdd2286b5a5094f36d4f3c7c58340745664449 Partial-blueprint: keystone-v3
2017-04-19Merge "Remove root_template and root_environment from capabilities-map.yaml"Jenkins1-8/+0
2017-04-19SSHD Service extensionsLuke Hinds11-4/+46
This change implements a MOTD message and provides a hash of sshd config options which are sourced to the puppet-ssh module as a hash. The SSHD puppet service is enabled by default, as it is required for Idb56acd1e1ecb5a5fd4d942969be428cc9cbe293. Also added the service to the CI roles. Change-Id: Ie2e01d93082509b8ede37297067eab03bb1ab06e Depends-On: I1d09530d69e42c0c36311789166554a889e46556 Closes-Bug: #1668543 Co-Authored-By: Oliver Walsh <owalsh@redhat.com>
2017-04-19Containers: disable downloading rabbitmqadminJiri Stransky1-1/+4
There's no need for puppet to download rabbitmqadmin script from rabbitmq, as the script would be immediately deleted together with the ephemeral puppet container. Also, since rabbitmq isn't running at the time we run the puppet container (rabbitmq doesn't have config files generated at that point), puppet couldn't connect to rabbitmq anyway. Change-Id: Ia59e1013c24ab02037246135024418cc9b674606 Closes-Bug: #1684104
2017-04-19N->O upgrade, fix wrong parameters to nova placement.Sofer Athlan-Guyot1-1/+2
According to [1] we need os_region_name, not region_name. Furthermore the os_interface is configured as well. The hard check on this parameter was introduced in ocata[2], explaining why the newton version did not chock on it. [1] https://docs.openstack.org/ocata/config-reference/compute/config-options.html [2] https://github.com/openstack/nova/commit/d486315e0 Closes-Bug: #1684058 Change-Id: If6118bf03e832fe3fa5ea4fcb1b436afd2adf80a
2017-04-19containers: TLS in the internal network for telemetry servicesJuan Antonio Osorio Robles4-0/+65
This covers aodh, gnocchi and panko. cp tls-via-certmonger-containers Change-Id: I6dabb0d82755c28b8940c0baab0e23cfcc587c42
2017-04-19Merge "Introduce common CAs to be mounted to the containers"Jenkins1-0/+5
2017-04-19Merge "Introduce common resources for docker templates"Jenkins36-349/+644
2017-04-19Merge "Rework DOCKER_PUPPET_CONFIG validate tool"Jenkins1-7/+11
2017-04-19TLS-everywhere: Enable for TLS libvirt live migrationJuan Antonio Osorio Robles2-0/+88
This relies on using the default paths for certs/keys used by libvirt and is only enabled if TLS-everywhere is enabled. bp tls-via-certmonger Depends-On: If18206d89460f6660a81aabc4ff8b97f1f99bba7 Depends-On: I0a1684397ebefaa8dc00237e0b7952e9296381fa Change-Id: I0538bbdd54fd0b82518585f4f270b4be684f0ec4
2017-04-19Merge "Use underscore for Aodh and Gnocchi's container names"Jenkins2-4/+4
2017-04-19Merge "Use tripleo profile for bigswitch agent"Jenkins1-3/+1
2017-04-19Merge "Add migration SSH tunneling support"Jenkins3-1/+22
2017-04-18Merge "SSH known_hosts config"Jenkins11-1/+324
2017-04-18Merge "Run token flush cron job hourly by default"Jenkins2-1/+8
2017-04-18Merge "Support for external swift proxy"Jenkins5-0/+89
2017-04-18scenario001/pingtest: enable Gnocchi resource againEmilien Macchi1-15/+13
We disabled it because it stopped working. Let's see how it works now. Change-Id: If1efb86cb1d6ada357d4562408a566ac702fb6be Closes-Bug: #1646506
2017-04-18Merge "Fix nova-compute service name in upgrade steps"Jenkins2-2/+2