aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-01-09Make update-from-keystone-admin-internal-api.yaml work on newton+Cyril Lopez1-28/+1
There are change of ServiceNetMapDefaults in service_net_map.j2.yaml but were not reproduce in update-from-keystone-admin-internal-api.yaml environment. Tested in newton. Closes-Bug: #1646862 Change-Id: I307dcaabbc6d583896090bf3f046b442007fbc42 Signed-off-by: Cyril Lopez <cylopez@redhat.com> Co-Authored-By: Gregory Charot <gcharot@redhat.com>
2016-12-02Merge "scenario001: deploy Cinder with RBD backend"Jenkins2-1/+15
2016-12-02Merge "Add Zaqar to scenario002"Jenkins2-1/+9
2016-12-02Merge "Composable Zaqar services"Jenkins8-0/+597
2016-12-02Merge "Use FQDN for rabbitmq's nodename env variable"Jenkins1-1/+7
2016-12-02Merge "Use network-based fqdn entry from hiera instead of the custom fact"Jenkins11-21/+21
2016-12-02Merge "scenario001: deploy Ceph"Jenkins1-3/+24
2016-12-02Merge "Implement scenario004 with Ceph Rados Gateway scenario"Jenkins2-0/+189
2016-12-01Merge "scenario003: configure Keystone tokens with Fernet provider"Jenkins1-0/+1
2016-12-01scenario001: deploy Cinder with RBD backendEmilien Macchi2-1/+15
Improve scenario001 with Cinder + RBD coverage. Also remove Barbican bits, we don't deploy Barbican in scenario001, but 002. Change-Id: Ib9cadbefcb3ddcdb4812f47ff5496e74b2bd888d
2016-12-01Merge "ceph-rgw: add missing user parameter"Jenkins1-0/+1
2016-12-01Merge "scenario001/pingtest: remove gnocchi_res_alarm"Jenkins1-13/+15
2016-12-01scenario003: configure Keystone tokens with Fernet providerEmilien Macchi1-0/+1
Improve scenario003 to configure Keystone tokens with Fernet provider. Scenario001 and scenario002 will still deploy uuid for now. Change-Id: I8c671d0371b2c3590b58b9623bb0df0b0c625a5b
2016-12-01Implement scenario004 with Ceph Rados Gateway scenarioEmilien Macchi2-0/+189
Like Puppet OpenStack CI, implement scenario004 with Ceph RGW scenario, where Glance uses it as a image storage backend. Change-Id: If055ca225c456a738c5726ef1e76a4a4f9c566a8
2016-12-01ceph-rgw: add missing user parameterEmilien Macchi1-0/+1
'user' is required or puppet-ceph will complain that the Keystone_user has no title: Evaluation Error: Missing title. The title expression resulted in undef at /etc/puppet/modules/ceph/manifests/rgw/keystone/auth.pp The value is set to Swift, as we use the same credentials as Swift service. Closes-Bug: #1642524 Change-Id: Ib4a7c07086b0b3354c8e589612f330ecdffdc637
2016-12-01Merge "Initial support for composable upgrades with Heat+Ansible"Jenkins13-3/+253
2016-12-01Merge "Introduce network-based FQDNs via hiera"Jenkins6-0/+217
2016-12-01Merge "Make pep8 task run template generation"Jenkins1-2/+4
2016-12-01Merge "Add local template generation tox task"Jenkins5-0/+150
2016-12-01scenario001: deploy CephEmilien Macchi1-3/+24
Add Ceph to scenario001 and use it as a backend for Nova, Glance and Gnocchi. Change-Id: I29065d4b2ac39db40984873fda550d7adbe904fe
2016-12-01scenario001/pingtest: remove gnocchi_res_alarmEmilien Macchi1-13/+15
The resource is failing and it prevents us to add more coverage. Until we figure what's wrong with it, let's disable it. Change-Id: If89775bf67d686327d0d27222e0c9179be74a668
2016-12-01Merge "Make scenario template paths relative"Jenkins1-5/+5
2016-12-01Merge "Configure /etc/hosts via os-collect-config script"Jenkins3-7/+64
2016-12-01Merge "Show team and repo badges on README"Jenkins1-0/+9
2016-12-01Initial support for composable upgrades with Heat+AnsibleSteven Hardy13-3/+253
This shows how we could wire in the upgrade steps using Ansible as was previously proposed e.g in https://review.openstack.org/#/c/321416/ but it's more closely integrated with the new composable services architecture. It's also very similar to the approach taken by SpinalStack where ansible snippets per-service were combined then run in a series of steps using Ansible tags. This patch just enables upgrade of keystone - we'll add support for other patches in subsequent patches. Partially-Implements: blueprint overcloud-upgrades-per-service Change-Id: I39f5426cb9da0b40bec4a7a3a4a353f69319bdf9
2016-12-01Merge "Hiera optimization: use a new hiera hook"Jenkins27-475/+389
2016-12-01Merge "Fix puppet/services/README.rst step description"Jenkins1-6/+0
2016-12-01Use FQDN for rabbitmq's nodename env variableJuan Antonio Osorio Robles1-1/+7
Change-Id: Iee1afeced0b210a46b273aafc0d40e99d6ee6d4e
2016-12-01Use network-based fqdn entry from hiera instead of the custom factJuan Antonio Osorio Robles11-21/+21
This changes how we get the network-based FQDNs for the specific services, from using the custom fact, to the new hiera entries. Change-Id: Iae668a5d89fb7bee091db4a761aa6c91d369b276
2016-12-01Introduce network-based FQDNs via hieraJuan Antonio Osorio Robles6-0/+217
Currently, one can get the network-based FQDNs via a custom puppet fact. This is currently unreliable, as it's based on the ::hostname fact which we assume it's set correctly by nova. However, this is not necessarily the case (for instance, if you use pre-deployed services such as we do with the multinode-jobs). In these cases, the ::hostname fact will return something other than what we specified in nova, and effectively breaks the configurations in we relly too much on the network-based FQDN facts. By using hiera instead, we avoid this issue as we set those values to be exactly what we expect (as we set them in the OS::TripleO::Server resource. Change-Id: I6ce31237098f57bdc0adfd3c42feef0073c224fb
2016-11-30Hiera optimization: use a new hiera hookDan Prince27-475/+389
This patch optimizes how we deploy hiera by using a new heat hook specifically designed to help compose hiera within heat templates. As part of this change: - we update all the 'hiera' software configurations to set the group to hiera instead of os-apply-config. - The new format uses JSON instead of YAML. The hook actually writes out the hiera JSON directly so no conversion takes place. Arrays, Strings, Booleans all stay in their native formats. As such we can avoid having to do many of the awkward string and list conversions in t-h-t to support the previous YAML formatting. - The new hook prefers JSON over YAML so upgrading users will have the new files prefered. (we will post a cleanup routine for the old files soon but this isn't a new behavior, JSON is now simply prefered.) - A lot of services required edits to account for default settings that worked in YAML that no longer work correctly in the native JSON format. In almost all these cases I think the resulting codes looks cleaner and is more explicit with regards to what is getting configured in hiera on the actual nodes. Depends-On: I6a383b1ad4ec29458569763bd3f56fd3f2bd726b Closes-bug: #1596373 Change-Id: Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1
2016-11-30Make pep8 task run template generationDan Prince1-2/+4
This patch updates the pep8 task (which is executed in CI) so that it generates templates locally. This will give us extra CI coverage to ensure our generated templates produce valid YAML. Change-Id: I2287802d44c0ebe404d3fce30f04efcc3c6ab27f
2016-11-30Add local template generation tox taskDan Prince5-0/+150
This patch adds a local version of our template processing routine so that developers can more quickly view the templates that are actually getting generated. I've noticed multiple developers now do a full deployment with 'overcloud deploy' only to download the swift container with the generated templates. This simple task avoids that step by allowing developers to generate it locally. It also aims to preserve the ability to use t-h-t templates directly with Heat (instead of going through Mistral) should users wish to do that. The new undercloud heat installer requires the ability to generate templates without requiring Mistral and Swift to do so. Ideally the Mistral API workflow would use this same code so perhaps in the future we might modify that routine to: -download swift tarball containing the templates -run this local routine that lives in t-h-t -re-upload the tarball of templates to the swift container Change-Id: Ie664c9c5f455b7320a58a26f35bc403355408d9b
2016-11-30Configure /etc/hosts via os-collect-config scriptDan Prince3-7/+64
This patch moves the t-i-e element code for hosts configuration into a t-h-t shell script that gets driven by a os-collect-config script hook. This helps accomplish several goals: - moves us away from t-i-e - gives us better signal handling in the error case (where the previous element relied on 99-refresh-completed - Allows the t-h-t undercloud installer to more easily consume this since it doesn't rely on the old os-apply-config metadata (which that installer doesn't support). Change-Id: I73c3d4818ef531a3559fab272521f44519e2f486
2016-11-30Merge "Add Neutron network type and VLAN ranges to network-environment.yaml"Jenkins1-0/+5
2016-11-30Add Zaqar to scenario002Brad P. Crochet2-1/+9
Install Zaqar into the overcloud and create a queue with OS::Zaqar::Queue in order to test the Zaqar composable service. Change-Id: I9027d17fa3d75e6c3e23d6636642abadac8730ac Depends-On: Ia5ca4fe317339dd05b0fa3d5abebca6ca5066bce
2016-11-30Merge "Add Mistral to scenario003"Jenkins2-0/+25
2016-11-30Merge "get-occ-config.sh replace deprecated heat commands"Jenkins1-10/+10
2016-11-30Merge "Test encrypted volumes in scenario002"Jenkins2-0/+18
2016-11-30Merge "Apply os-net-config with a script instead of element"Jenkins35-1841/+2137
2016-11-30Make scenario template paths relativeBrad P. Crochet1-5/+5
To make local testing of scenario patches easier, this changes the paths to the templates under test to be relative to the scenarios. Change-Id: I12a45ee917c214a071f5de1e28f632dbf7d1fe9d
2016-11-30Add Mistral to scenario003Brad P. Crochet2-0/+25
Install Mistral into the test overcloud and create a workflow to verify the Mistral installation. This does not currently actually execute the workflow. It merely tests that it can be created. Change-Id: Ia03a605bcfd92498bf299d3042dca7c9932f5b63 Depends-On: Id5ff9cb498b5a47af38413d211ff0ed6ccd0015b
2016-11-30Merge "Disable all repos during rhel registration"Jenkins1-0/+1
2016-11-29Fix grammarEmilien Macchi1-1/+1
Fix English grammar error I did in a previous commit. Change-Id: I06209ab782240f05844793e56270135d48792f3d
2016-11-29Merge "Revert "Set NeutronL3HA to false when deploying DVR""Jenkins1-8/+0
2016-11-29Merge "Import TripleO CI environments from tripleo-ci"Jenkins8-0/+668
2016-11-29Test encrypted volumes in scenario002Juan Antonio Osorio Robles2-0/+18
This effectively adds barbican-api to the deployment in scenario002 and uses it to provide encrypted volumes for cinder that a nova instance boots from in the test. Change-Id: I132e346755fb49c9563247b4404be06b97f77872
2016-11-29Merge "Stop using puppet to configure VIPs in /etc/hosts"Jenkins7-98/+55
2016-11-28get-occ-config.sh replace deprecated heat commandsSteve Baker1-10/+10
The modern openstack equivalent heat commands require no awk and will be slightly more efficient. The roles variable is optionally populated by OVERCLOUD_ROLES so that a subset of roles can be specified. Change-Id: I6b66cb3bd81825fba726dd45b0db25896908f6dd
2016-11-28Apply os-net-config with a script instead of elementDan Prince35-1841/+2137
Wire in os-net-config via a normal script heat deployment, which has the following advantages: 1. Improved error path, currently o-a-c deployments don't report any errors, thus hang and eventually the deployment times out 2. It's far more hackable from a deployer perspective, e.g it's much easier to change the os-net-config options or include a mapping file 3. Reduces our dependencies on o-a-c (it's only os-net-config and hiera which requires it), although the script does currently still use oac to get the metadata IP. 4. May enable passing os-net-config yaml via a json parameter in future, reducing the need for resource_registry mappings (although we'll have to support that for backwards compatibility) The script used is based directly on 20-os-net-config (from t-i-e at cf94c5e, we can probably improve this now that we have an error path, but for this initial commit it's a straight copy other than the changes to replace o-a-c for rendering the json config file. Co-Authored-By: Steven Hardy <shardy@redhat.com> Change-Id: I0ed08332cfc49a579de2e83960f0d8047690b97a