apex-tripleo-heat-templates.git
7 years agoIntroduce role-specific nova-server-metadata
Juan Antonio Osorio Robles [Wed, 14 Dec 2016 06:08:43 +0000 (08:08 +0200)]
Introduce role-specific nova-server-metadata

We could already pass metadata to the nova server instances (on
creation) via the ServerMetadata parameter, however, there was no
way of doing this per-role. This introduces that by adding a
{{role}}ServerMetadata parameter for each role. This parameter gets
merged with the ServerMetadata parameter and allows this
functionality.

Note that both default to {}, and so does the result of merging those
parameters with their default values. So nothing changes for the
default settings.

Change-Id: I334edcc51ce7ee82fc13b6cf4c0d74ccb7db099c

7 years agoMerge "Deployed server: switch to apply-config hook"
Jenkins [Thu, 15 Dec 2016 05:59:48 +0000 (05:59 +0000)]
Merge "Deployed server: switch to apply-config hook"

7 years agoMerge "Don't rely on lsb_release for hosts template write"
Jenkins [Tue, 13 Dec 2016 14:36:20 +0000 (14:36 +0000)]
Merge "Don't rely on lsb_release for hosts template write"

7 years agoMerge "docker: don't use custom run-os-net-config"
Jenkins [Tue, 13 Dec 2016 14:35:29 +0000 (14:35 +0000)]
Merge "docker: don't use custom run-os-net-config"

7 years agoMerge "Add FreeIPA enrollment template"
Jenkins [Mon, 12 Dec 2016 09:22:00 +0000 (09:22 +0000)]
Merge "Add FreeIPA enrollment template"

7 years agoMerge "Add NIC config for compute role for DVR with multiple NICs"
Jenkins [Sat, 10 Dec 2016 00:19:36 +0000 (00:19 +0000)]
Merge "Add NIC config for compute role for DVR with multiple NICs"

7 years agoAdd FreeIPA enrollment template
Juan Antonio Osorio Robles [Wed, 7 Dec 2016 10:12:25 +0000 (12:12 +0200)]
Add FreeIPA enrollment template

This is based on previous work [1] and it's what I've been using to
test the TLS-everywhere work.

This introduces a template that will run on every node to enroll
them to FreeIPA and acquire a ticket (authenticate) in order to be
able to request certificates.

Enrollment is done via the ipa-client-install command and it does
the following:

* Get FreeIPA's CA certificate and trust it.
* Authenticate to FreeIPA using an OTP and get a kerberos keytab.
* Set up several configurations that are needed for FreeIPA (sssd,
  kerberos, certmonger)

The keytab is then used to authenticate and get an actual TGT
(Ticket-Granting-Ticket) from Kerberos

The previous implementation used a PreConfig hook, however, here it
was modified to use NodeTLSCAData. This has the advantage that it
runs on every node as opposed to the PreConfig hook where we had to
specify the role type so it's a usability improvement. And, on the
other hand, this does set up necessary things for the usage of
FreeIPA as a CA, such as getting the certificate and enrolling to the
CA.

[1] https://github.com/JAORMX/freeipa-tripleo-incubator

bp tls-via-certmonger

Change-Id: Iac94b3b047dca1bcabd464ea8eed6f1220c844f1

7 years agoDon't rely on lsb_release for hosts template write
Steve Baker [Tue, 6 Dec 2016 23:06:44 +0000 (23:06 +0000)]
Don't rely on lsb_release for hosts template write

This is problematic for the containerised heat-agents, lsb_release has
to be bind-mounted in, and atomic host doesn't even have lsb_release
installed.

Instead just write to every /etc/cloud/templates/hosts.*.tmpl file.

Change-Id: If2aab7e9b1e03aa657baf1c33aa4392ef7044075

7 years agodocker: don't use custom run-os-net-config
Steve Baker [Tue, 6 Dec 2016 03:27:04 +0000 (16:27 +1300)]
docker: don't use custom run-os-net-config

The script run-os-net-config[1] copies in ifcfg-* from the host before
running os-net-config. Apparently it was done this way because the
other scripts in /etc/sysconfig/network-scripts/ differed between host
and agent container. This should be less of an issue now that host and
heat-agents run centos-7 (even when the host is atomic)

tripleo-heat-templates recently changed to running os-net-config in a
deployment script instead of an os-refresh-config script [2]. This
means that our current run-os-net-config approach is currently
resulting in os-net-config being executed twice.

Another issue with run-os-net-config is that it copies ifcfg-* from
host to container, but not back again. This means that rebooting the
server will result in unconfigured interfaces until os-net-config is
somehow run again.

This change bind mounts /etc/sysconfig/network-scripts/ from the host
and uses the conventional approach to running os-refresh-config.

This may fix the issue where compute nodes are losing network
connectivity, so
Closes-Bug: #1646897

[1] http://git.openstack.org/cgit/openstack/tripleo-common/tree/heat_docker_agent/run-os-net-config
[2] I0ed08332cfc49a579de2e83960f0d8047690b97a

Change-Id: I763fc8d8e3eb10ac64d33e46c92888d211003e72

7 years agoMerge "Enable haproxy internal TLS through enable-internal-tls.yaml"
Jenkins [Thu, 8 Dec 2016 16:25:08 +0000 (16:25 +0000)]
Merge "Enable haproxy internal TLS through enable-internal-tls.yaml"

7 years agoMerge "Make get-occ-config.sh support custom roles"
Jenkins [Thu, 8 Dec 2016 02:59:31 +0000 (02:59 +0000)]
Merge "Make get-occ-config.sh support custom roles"

7 years agoMerge "neutron: don't set router_delete_namespaces"
Jenkins [Wed, 7 Dec 2016 16:23:33 +0000 (16:23 +0000)]
Merge "neutron: don't set router_delete_namespaces"

7 years agoEnable haproxy internal TLS through enable-internal-tls.yaml
Juan Antonio Osorio Robles [Wed, 7 Dec 2016 07:03:18 +0000 (09:03 +0200)]
Enable haproxy internal TLS through enable-internal-tls.yaml

For usability and to reduce the number of environments that need to be
given when enabling TLS in the internal network, it's convenient to add
the enabling of TLS in the internal front-ends for HAProxy, instead of
doing that in a separate environment file.

bp tls-via-certmonger

Change-Id: Icef0c70b4b166ce2108315d5cf0763d4e8585ae1

7 years agoneutron: don't set router_delete_namespaces
Ihar Hrachyshka [Tue, 6 Dec 2016 22:02:18 +0000 (22:02 +0000)]
neutron: don't set router_delete_namespaces

It's no longer available in Neutron (removed in Mitaka). See:
I2a879213c3b095a007a4531f430a33cea9fdf1bd

Change-Id: I044c648eb8c4933667b8ea2c9159a30e5ebb7df3

7 years agoFix SwiftStorage role.
Chris Jones [Tue, 6 Dec 2016 13:31:42 +0000 (14:31 +0100)]
Fix SwiftStorage role.

We now fetch the name argument from the correctly named SwiftStorage
object.

Change-Id: I885505eadfc778ab57793c97af4d1c6739ec9614
Closes-Bug: #1647716

7 years agoMerge "Support multiple meter dispatchers in ceilometer config"
Jenkins [Mon, 5 Dec 2016 14:28:37 +0000 (14:28 +0000)]
Merge "Support multiple meter dispatchers in ceilometer config"

7 years agoMerge "Move nodes' fqdns to a map to remove clutter"
Jenkins [Mon, 5 Dec 2016 14:28:29 +0000 (14:28 +0000)]
Merge "Move nodes' fqdns to a map to remove clutter"

7 years agoMerge "Use transient hostname for deployed servers"
Jenkins [Mon, 5 Dec 2016 14:14:48 +0000 (14:14 +0000)]
Merge "Use transient hostname for deployed servers"

7 years agoMerge "Fix bug when using multiple DeployArtifactURLs"
Jenkins [Mon, 5 Dec 2016 14:12:37 +0000 (14:12 +0000)]
Merge "Fix bug when using multiple DeployArtifactURLs"

7 years agoMerge "No longer hard coding to a specifc network interface name."
Jenkins [Fri, 2 Dec 2016 19:49:48 +0000 (19:49 +0000)]
Merge "No longer hard coding to a specifc network interface name."

7 years agoAdd NIC config for compute role for DVR with multiple NICs
Dan Sneddon [Fri, 2 Dec 2016 18:12:17 +0000 (10:12 -0800)]
Add NIC config for compute role for DVR with multiple NICs

This change adds a NIC config to the multiple-nics sample NIC
config templates for a compute node running DVR. In order for
DVR to work on the compute nodes, they must share an external
bridge with the controllers. All of the other sample NIC
configs already have an external bridge (defaults to 'br-ex'),
but the multiple-nics compute role does not, so now the
compute-dvr.yaml NIC template will demonstrate DVR with
multiple NICs.

Change-Id: I80fe2e5842a67984e1d4d8aa295c7607c4f340ad

7 years agoMerge "Revert "Use FQDN for rabbitmq's nodename env variable""
Jenkins [Fri, 2 Dec 2016 18:07:32 +0000 (18:07 +0000)]
Merge "Revert "Use FQDN for rabbitmq's nodename env variable""

7 years agoMerge "Add zaqar to the controller's list of services in roles_data.yaml"
Jenkins [Fri, 2 Dec 2016 18:06:33 +0000 (18:06 +0000)]
Merge "Add zaqar to the controller's list of services in roles_data.yaml"

7 years agoFix bug when using multiple DeployArtifactURLs
Christian Schwede [Thu, 1 Dec 2016 14:15:22 +0000 (15:15 +0100)]
Fix bug when using multiple DeployArtifactURLs

The script tries to download all artifact URLs with a single
request, instead of downloading each URL on its own if
multiple DeployArtifactURLs were given.

Change-Id: I6a8be699aff7023a67702bb1d3ddc2273984cd08

7 years agoRevert "Use FQDN for rabbitmq's nodename env variable"
Ben Nemec [Fri, 2 Dec 2016 15:45:21 +0000 (15:45 +0000)]
Revert "Use FQDN for rabbitmq's nodename env variable"

This seems to have broken the updates job, causing it to fail
with following error:

Can't set long node name!\nPlease check your configuration\n

Related-Bug: 1646873

This reverts commit 3e9fcfd09320ace07bc1bd4cb57feb98cd057332.

Change-Id: I72ba891cd9cd8c4f1bc204144f46aaabbdfd3647

7 years agoMerge "scenario001: deploy Cinder with RBD backend"
Jenkins [Fri, 2 Dec 2016 14:34:41 +0000 (14:34 +0000)]
Merge "scenario001: deploy Cinder with RBD backend"

7 years agoAdd zaqar to the controller's list of services in roles_data.yaml
Juan Antonio Osorio Robles [Fri, 2 Dec 2016 12:14:33 +0000 (14:14 +0200)]
Add zaqar to the controller's list of services in roles_data.yaml

Change-Id: Iecafa7878fec20c707e94bdaca55f1489f3e338a

7 years agoMerge "Add Zaqar to scenario002"
Jenkins [Fri, 2 Dec 2016 12:09:12 +0000 (12:09 +0000)]
Merge "Add Zaqar to scenario002"

7 years agoMerge "Composable Zaqar services"
Jenkins [Fri, 2 Dec 2016 12:08:37 +0000 (12:08 +0000)]
Merge "Composable Zaqar services"

7 years agoMove nodes' fqdns to a map to remove clutter
Juan Antonio Osorio Robles [Fri, 2 Dec 2016 08:33:16 +0000 (10:33 +0200)]
Move nodes' fqdns to a map to remove clutter

There were several instances where the short-names/FQDNs where being
gotten in the same way in the role's templates. So this introduces a
mapping to get these values in order to reduce clutter.

Change-Id: Ie7df360bb69d56655f3e0fcbbf4d297db39b7a26

7 years agoMerge "Use FQDN for rabbitmq's nodename env variable"
Jenkins [Fri, 2 Dec 2016 09:41:28 +0000 (09:41 +0000)]
Merge "Use FQDN for rabbitmq's nodename env variable"

7 years agoMerge "Use network-based fqdn entry from hiera instead of the custom fact"
Jenkins [Fri, 2 Dec 2016 09:40:36 +0000 (09:40 +0000)]
Merge "Use network-based fqdn entry from hiera instead of the custom fact"

7 years agoMerge "scenario001: deploy Ceph"
Jenkins [Fri, 2 Dec 2016 00:06:06 +0000 (00:06 +0000)]
Merge "scenario001: deploy Ceph"

7 years agoMerge "Implement scenario004 with Ceph Rados Gateway scenario"
Jenkins [Fri, 2 Dec 2016 00:05:20 +0000 (00:05 +0000)]
Merge "Implement scenario004 with Ceph Rados Gateway scenario"

7 years agoMerge "scenario003: configure Keystone tokens with Fernet provider"
Jenkins [Thu, 1 Dec 2016 23:10:07 +0000 (23:10 +0000)]
Merge "scenario003: configure Keystone tokens with Fernet provider"

7 years agoMake get-occ-config.sh support custom roles
James Slagle [Wed, 12 Oct 2016 20:06:00 +0000 (16:06 -0400)]
Make get-occ-config.sh support custom roles

Updates the get-occ-config.sh script used with the deployed-server
environment to support custom roles. Any custom role name, and a
corresponding set of hosts (ip addresses or hostnames) can now be passed
to the script and it will query for the proper nested stack uuid's and
configure os-collect-config appropriately on the respective nodes.

Change-Id: I8fc39e6d18cd70ff881e2a284234b26261018d67

7 years agoscenario001: deploy Cinder with RBD backend
Emilien Macchi [Thu, 1 Dec 2016 17:37:04 +0000 (12:37 -0500)]
scenario001: deploy Cinder with RBD backend

Improve scenario001 with Cinder + RBD coverage.
Also remove Barbican bits, we don't deploy Barbican in scenario001, but
002.

Change-Id: Ib9cadbefcb3ddcdb4812f47ff5496e74b2bd888d

7 years agoMerge "ceph-rgw: add missing user parameter"
Jenkins [Thu, 1 Dec 2016 19:59:51 +0000 (19:59 +0000)]
Merge "ceph-rgw: add missing user parameter"

7 years agoMerge "scenario001/pingtest: remove gnocchi_res_alarm"
Jenkins [Thu, 1 Dec 2016 19:56:23 +0000 (19:56 +0000)]
Merge "scenario001/pingtest: remove gnocchi_res_alarm"

7 years agoscenario003: configure Keystone tokens with Fernet provider
Emilien Macchi [Thu, 1 Dec 2016 18:35:44 +0000 (13:35 -0500)]
scenario003: configure Keystone tokens with Fernet provider

Improve scenario003 to configure Keystone tokens with Fernet provider.
Scenario001 and scenario002 will still deploy uuid for now.

Change-Id: I8c671d0371b2c3590b58b9623bb0df0b0c625a5b

7 years agoImplement scenario004 with Ceph Rados Gateway scenario
Emilien Macchi [Tue, 29 Nov 2016 22:47:36 +0000 (17:47 -0500)]
Implement scenario004 with Ceph Rados Gateway scenario

Like Puppet OpenStack CI, implement scenario004 with Ceph RGW scenario,
where Glance uses it as a image storage backend.

Change-Id: If055ca225c456a738c5726ef1e76a4a4f9c566a8

7 years agoceph-rgw: add missing user parameter
Emilien Macchi [Thu, 1 Dec 2016 15:00:18 +0000 (10:00 -0500)]
ceph-rgw: add missing user parameter

'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

7 years agoMerge "Initial support for composable upgrades with Heat+Ansible"
Jenkins [Thu, 1 Dec 2016 16:47:37 +0000 (16:47 +0000)]
Merge "Initial support for composable upgrades with Heat+Ansible"

7 years agoMerge "Introduce network-based FQDNs via hiera"
Jenkins [Thu, 1 Dec 2016 16:47:31 +0000 (16:47 +0000)]
Merge "Introduce network-based FQDNs via hiera"

7 years agoMerge "Make pep8 task run template generation"
Jenkins [Thu, 1 Dec 2016 16:46:56 +0000 (16:46 +0000)]
Merge "Make pep8 task run template generation"

7 years agoMerge "Add local template generation tox task"
Jenkins [Thu, 1 Dec 2016 16:46:17 +0000 (16:46 +0000)]
Merge "Add local template generation tox task"

7 years agoscenario001: deploy Ceph
Emilien Macchi [Tue, 29 Nov 2016 22:56:59 +0000 (17:56 -0500)]
scenario001: deploy Ceph

Add Ceph to scenario001 and use it as a backend for Nova, Glance and
Gnocchi.

Change-Id: I29065d4b2ac39db40984873fda550d7adbe904fe

7 years agoscenario001/pingtest: remove gnocchi_res_alarm
Emilien Macchi [Thu, 1 Dec 2016 14:49:04 +0000 (09:49 -0500)]
scenario001/pingtest: remove gnocchi_res_alarm

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

7 years agoMerge "Make scenario template paths relative"
Jenkins [Thu, 1 Dec 2016 15:59:40 +0000 (15:59 +0000)]
Merge "Make scenario template paths relative"

7 years agoMerge "Configure /etc/hosts via os-collect-config script"
Jenkins [Thu, 1 Dec 2016 14:43:26 +0000 (14:43 +0000)]
Merge "Configure /etc/hosts via os-collect-config script"

7 years agoMerge "Show team and repo badges on README"
Jenkins [Thu, 1 Dec 2016 14:28:59 +0000 (14:28 +0000)]
Merge "Show team and repo badges on README"

7 years agoInitial support for composable upgrades with Heat+Ansible
Steven Hardy [Thu, 1 Dec 2016 10:00:57 +0000 (10:00 +0000)]
Initial support for composable upgrades with Heat+Ansible

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

7 years agoMerge "Hiera optimization: use a new hiera hook"
Jenkins [Thu, 1 Dec 2016 13:01:14 +0000 (13:01 +0000)]
Merge "Hiera optimization: use a new hiera hook"

7 years agoMerge "Fix puppet/services/README.rst step description"
Jenkins [Thu, 1 Dec 2016 12:17:02 +0000 (12:17 +0000)]
Merge "Fix puppet/services/README.rst step description"

7 years agoUse FQDN for rabbitmq's nodename env variable
Juan Antonio Osorio Robles [Mon, 28 Nov 2016 08:15:32 +0000 (10:15 +0200)]
Use FQDN for rabbitmq's nodename env variable

Change-Id: Iee1afeced0b210a46b273aafc0d40e99d6ee6d4e

7 years agoUse network-based fqdn entry from hiera instead of the custom fact
Juan Antonio Osorio Robles [Mon, 28 Nov 2016 11:07:12 +0000 (13:07 +0200)]
Use network-based fqdn entry from hiera instead of the custom fact

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

7 years agoIntroduce network-based FQDNs via hiera
Juan Antonio Osorio Robles [Mon, 28 Nov 2016 10:58:25 +0000 (12:58 +0200)]
Introduce network-based FQDNs via hiera

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

7 years agoHiera optimization: use a new hiera hook
Dan Prince [Tue, 11 Oct 2016 01:09:01 +0000 (21:09 -0400)]
Hiera optimization: use a new hiera hook

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

7 years agoMake pep8 task run template generation
Dan Prince [Mon, 7 Nov 2016 12:59:03 +0000 (07:59 -0500)]
Make pep8 task run template generation

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

7 years agoUse transient hostname for deployed servers
Steve Baker [Wed, 30 Nov 2016 20:20:02 +0000 (20:20 +0000)]
Use transient hostname for deployed servers

The name output returned by this template is expected to be the short
name rather than a FQDN.  Generally 'hostnamectl --static' returns a
FQDN and --transient will be the short name.

This change switches to using --transient and also simplifies the
script by dropping the unused outputs.

Change-Id: I19eaf9f66668f7e68765bad4018c0c60314f3f8f

7 years agoDeployed server: switch to apply-config hook
Dan Prince [Thu, 10 Nov 2016 12:35:36 +0000 (07:35 -0500)]
Deployed server: switch to apply-config hook

This patch switches the deployed-server.yaml template to use
apply-config instead of os-apply-config. The 'apply-config' hook
is now installed via a package (no longer requires elements for
installation) and supports more signalling options.

This is required to support the undercloud installer which doesn't work
with os-collect-config heat metadata.

Change-Id: I7963fe4f38e8f04c9871fe651d39efec1aa17c41

7 years agoAdd local template generation tox task
Dan Prince [Mon, 7 Nov 2016 12:45:15 +0000 (07:45 -0500)]
Add local template generation tox task

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

7 years agoConfigure /etc/hosts via os-collect-config script
Dan Prince [Mon, 21 Nov 2016 13:43:01 +0000 (08:43 -0500)]
Configure /etc/hosts via os-collect-config script

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

7 years agoMerge "Add Neutron network type and VLAN ranges to network-environment.yaml"
Jenkins [Wed, 30 Nov 2016 19:15:02 +0000 (19:15 +0000)]
Merge "Add Neutron network type and VLAN ranges to network-environment.yaml"

7 years agoSupport multiple meter dispatchers in ceilometer config
Pradeep Kilambi [Wed, 30 Nov 2016 17:54:50 +0000 (12:54 -0500)]
Support multiple meter dispatchers in ceilometer config

Currently we only support one dispatcher at a time. But ceilometer
config supports dispatching data to multiple destinations at the
same time. Update the param to support this.

Change-Id: Ie7d854928513239a5903862623df12af1d02b642

7 years agoAdd Zaqar to scenario002
Brad P. Crochet [Wed, 30 Nov 2016 12:06:33 +0000 (07:06 -0500)]
Add Zaqar to scenario002

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

7 years agoMerge "Add Mistral to scenario003"
Jenkins [Wed, 30 Nov 2016 16:16:28 +0000 (16:16 +0000)]
Merge "Add Mistral to scenario003"

7 years agoMerge "get-occ-config.sh replace deprecated heat commands"
Jenkins [Wed, 30 Nov 2016 16:11:52 +0000 (16:11 +0000)]
Merge "get-occ-config.sh replace deprecated heat commands"

7 years agoMerge "Test encrypted volumes in scenario002"
Jenkins [Wed, 30 Nov 2016 16:00:39 +0000 (16:00 +0000)]
Merge "Test encrypted volumes in scenario002"

7 years agoMerge "Apply os-net-config with a script instead of element"
Jenkins [Wed, 30 Nov 2016 15:58:54 +0000 (15:58 +0000)]
Merge "Apply os-net-config with a script instead of element"

7 years agoMake scenario template paths relative
Brad P. Crochet [Wed, 30 Nov 2016 15:42:51 +0000 (10:42 -0500)]
Make scenario template paths relative

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

7 years agoAdd Mistral to scenario003
Brad P. Crochet [Wed, 30 Nov 2016 12:24:00 +0000 (07:24 -0500)]
Add Mistral to scenario003

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

7 years agoMerge "Disable all repos during rhel registration"
Jenkins [Wed, 30 Nov 2016 11:26:12 +0000 (11:26 +0000)]
Merge "Disable all repos during rhel registration"

7 years agoFix grammar
Emilien Macchi [Tue, 29 Nov 2016 22:28:07 +0000 (17:28 -0500)]
Fix grammar

Fix English grammar error I did in a previous commit.

Change-Id: I06209ab782240f05844793e56270135d48792f3d

7 years agoMerge "Revert "Set NeutronL3HA to false when deploying DVR""
Jenkins [Tue, 29 Nov 2016 17:22:25 +0000 (17:22 +0000)]
Merge "Revert "Set NeutronL3HA to false when deploying DVR""

7 years agoMerge "Import TripleO CI environments from tripleo-ci"
Jenkins [Tue, 29 Nov 2016 14:18:11 +0000 (14:18 +0000)]
Merge "Import TripleO CI environments from tripleo-ci"

7 years agoTest encrypted volumes in scenario002
Juan Antonio Osorio Robles [Tue, 29 Nov 2016 13:49:54 +0000 (15:49 +0200)]
Test encrypted volumes in scenario002

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

7 years agoMerge "Stop using puppet to configure VIPs in /etc/hosts"
Jenkins [Tue, 29 Nov 2016 01:02:31 +0000 (01:02 +0000)]
Merge "Stop using puppet to configure VIPs in /etc/hosts"

7 years agoget-occ-config.sh replace deprecated heat commands
Steve Baker [Sun, 27 Nov 2016 22:17:07 +0000 (22:17 +0000)]
get-occ-config.sh replace deprecated heat commands

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

7 years agoApply os-net-config with a script instead of element
Dan Prince [Wed, 23 Nov 2016 15:39:11 +0000 (10:39 -0500)]
Apply os-net-config with a script instead of element

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

7 years agoUse correct type for SensuRedactVariables parameter
Martin Mágr [Mon, 28 Nov 2016 13:19:59 +0000 (14:19 +0100)]
Use correct type for SensuRedactVariables parameter

The parameter type is invalid making it impossible to enable monitoring-environment.

Change-Id: I835d1e82480edb0b6d082a7496d7ceebb1781728
Closes-Bug: #1641080
Closes-Bug: rhbz#1392473

7 years agoMerge "Enable TLS in the internal networkf or Mysql"
Jenkins [Mon, 28 Nov 2016 10:17:03 +0000 (10:17 +0000)]
Merge "Enable TLS in the internal networkf or Mysql"

7 years agoMerge "adding swift middleware that is typically enabled by default"
Jenkins [Mon, 28 Nov 2016 09:48:31 +0000 (09:48 +0000)]
Merge "adding swift middleware that is typically enabled by default"

7 years agoRevert "Set NeutronL3HA to false when deploying DVR"
John Schwarz [Mon, 28 Nov 2016 09:15:01 +0000 (09:15 +0000)]
Revert "Set NeutronL3HA to false when deploying DVR"

DVR+HA routers are officially supported, so this patch can be reverted.

This reverts commit ce39dbac56123354576d2c31674e1b18535b0111.

Conflicts:
    environments/neutron-ovs-dvr.yaml

Change-Id: Ifeceb0c3ba01e81403903401ebfe69b9e9d7d2f2

7 years agoMerge "Cleanup some inline comments in network/config"
Jenkins [Sun, 27 Nov 2016 19:31:39 +0000 (19:31 +0000)]
Merge "Cleanup some inline comments in network/config"

7 years agoStop using puppet to configure VIPs in /etc/hosts
Dan Prince [Fri, 25 Nov 2016 16:20:57 +0000 (11:20 -0500)]
Stop using puppet to configure VIPs in /etc/hosts

This patch drops use of the vip-hosts.yaml service which can
cause issues during deployment because puppet 'hosts' resources
overwrite the data in /etc/hosts. The only reason things seem to work
at all at the moment is because our hosts element in t-i-e runs
on each os-refresh-config iteration and re-adds the dropped hosts
entries.

To work around the issue we add a conditional which selectively
adds the extra hosts entries only if the AddVipsToEtcHosts is set
to true.

Closes-bug: 1645123

Change-Id: Ic6aaeb249a127df83894f32a704219683a6382b2

7 years agoFix puppet/services/README.rst step description
Steven Hardy [Fri, 25 Nov 2016 16:57:41 +0000 (16:57 +0000)]
Fix puppet/services/README.rst step description

We removed Step 6 in Iae33149e4a03cd64c5831e689be8189ad0cf034b
but forgot to update the README.  Similarly we made all roles
use the same steps in Ia2ea559e8eeb64763908f75705e3728ee90b5744
so the comment is no longer true.

Change-Id: If5482ebd22a2547ed2165199992840a0dcacb04c

7 years agoShow team and repo badges on README
Flavio Percoco [Thu, 24 Nov 2016 13:02:31 +0000 (14:02 +0100)]
Show team and repo badges on README

This patch adds the team's and repository's badges to the README file.
The motivation behind this is to communicate the project status and
features at first glance.

For more information about this effort, please read this email thread:

http://lists.openstack.org/pipermail/openstack-dev/2016-October/105562.html

To see an example of how this would look like check:

b'https://gist.github.com/8e6d63aff05dc9e2a946f9012a34b334\n'

Change-Id: I0090c60b91624f6cc446bc020b1445b3919e0d40

7 years agoImport TripleO CI environments from tripleo-ci
Emilien Macchi [Thu, 24 Nov 2016 15:59:58 +0000 (10:59 -0500)]
Import TripleO CI environments from tripleo-ci

Import TripleO CI environments from tripleo-ci into THT for some
reasons:

1) THT is branched while tripleo-ci is not. Having them here would allow
   to make scenarios able to evolve over the releases without adding
   more scenarios.
2) Help our developers to run TripleO CI scenarios themselves from THT
   by exposing the templates here.

The whole discussion is here:
http://lists.openstack.org/pipermail/openstack-dev/2016-November/107816.html

Change-Id: I3527a64c0c8f56ca77115d32849fa23fe710112d

7 years agoProvide full list of services for Compute role in HCI scenario
Giulio Fidente [Fri, 25 Nov 2016 10:32:49 +0000 (11:32 +0100)]
Provide full list of services for Compute role in HCI scenario

Until bug #1635409 is fixed, we can provide the full list of
services needed on the Compute role, plus CephOSD, in the
hyperconverged-ceph environment file, preserving the user
experience.

Change-Id: I42409bc098c740759b378969526e13efaf002d3c
Related-Bug: #1635409

7 years agoEnable TLS in the internal networkf or Mysql
Juan Antonio Osorio Robles [Wed, 28 Sep 2016 09:51:13 +0000 (09:51 +0000)]
Enable TLS in the internal networkf or Mysql

This adds the necessary hieradata for enabling TLS for MySQL (which
happens to run on the internal network). It also adds a template so
this can be done via certmonger. As with other services, this will
fill the necessary specs for the certificate to be requested in a
hash that will be consumed in puppet-tripleo.

Note that this only enables that we can now use TLS, however, we still
need to configure the services (or limit the users the services use)
to only connect via SSL. But that will be done in another patch, as
there is some things that need to land before we can do this (changes
in puppetlabs-mysql and puppet-openstacklib).

Change-Id: I71e1d4e54f2be845f131bad7b8db83498e21c118
Depends-On: I7275e5afb3a6550cf2abbb9a8007dedb62ada4b4

7 years agoMerge "Increase reserved memory for computes when enabling DVR"
Jenkins [Thu, 24 Nov 2016 19:25:01 +0000 (19:25 +0000)]
Merge "Increase reserved memory for computes when enabling DVR"

7 years agoMerge "Disable Neutron agents with OVN."
Jenkins [Thu, 24 Nov 2016 19:24:54 +0000 (19:24 +0000)]
Merge "Disable Neutron agents with OVN."

7 years agoMerge "Make Ceilometer notifications non-blocking"
Jenkins [Thu, 24 Nov 2016 19:24:48 +0000 (19:24 +0000)]
Merge "Make Ceilometer notifications non-blocking"

7 years agoMerge "Remove conditional for neutron l3_ha"
Jenkins [Thu, 24 Nov 2016 17:30:28 +0000 (17:30 +0000)]
Merge "Remove conditional for neutron l3_ha"

7 years agoMerge "Run os-net-config before restarting cluster on update"
Jenkins [Thu, 24 Nov 2016 12:57:23 +0000 (12:57 +0000)]
Merge "Run os-net-config before restarting cluster on update"

7 years agoDisable Neutron agents with OVN.
Joe Talerico [Tue, 18 Oct 2016 16:01:27 +0000 (12:01 -0400)]
Disable Neutron agents with OVN.

OVN natively implements services that are provided by Neutron agents.
This patch disables the Neutron DHCP agent as well as the OVS agent
for compute nodes.

Closes-bug: 1634580

Change-Id: I70631c2facbbf08257868e26e14af942ad7f2893

7 years agoMerge "Explicitly set rabbit hosts so its not overridden during upgrade"
Jenkins [Thu, 24 Nov 2016 09:23:59 +0000 (09:23 +0000)]
Merge "Explicitly set rabbit hosts so its not overridden during upgrade"

7 years agoMerge "Add panko api support to service templates"
Jenkins [Thu, 24 Nov 2016 06:45:11 +0000 (06:45 +0000)]
Merge "Add panko api support to service templates"

7 years agoMerge "Add necessary parameters for encrypted volumes support"
Jenkins [Wed, 23 Nov 2016 18:50:49 +0000 (18:50 +0000)]
Merge "Add necessary parameters for encrypted volumes support"