apex-tripleo-heat-templates.git
7 years agoRender VIPs dynamically based on network_data.yaml
Dan Sneddon [Fri, 21 Jul 2017 21:33:33 +0000 (14:33 -0700)]
Render VIPs dynamically based on network_data.yaml

This change modifies the templates to dynamically define the VIPs
based on network_data.yaml. If a network is defined and marked
with "vip: true" in network_data.yaml, it will be included in the
overcloud.yaml which defines the deployment-level resources.

This should make it possible to create custom networks and
use them for services which use high-availability through VIPs.

Also, extraconfig/nova_metadata/krb-service-pricipals.yaml
was modified to dynamically produce the FQDN map for VIPs on
isolated networks, to match overcloud.j2.yaml.

Depends-On: If074f87494a46305c990a0ea332c7b576d3c6ed8
Depends-On: Iab8aca2f1fcaba0c8f109717a4b3068f629c9aab
Partially-implements: blueprint composable-networks
Closes-bug: 1667104
Change-Id: I71339a6ac41133e95dbc3f93abb7a9fdeb0f2da0

7 years agoMerge "Copy scheduler configuration from service/ironic to services-docker/ironic"
Jenkins [Fri, 4 Aug 2017 13:20:11 +0000 (13:20 +0000)]
Merge "Copy scheduler configuration from service/ironic to services-docker/ironic"

7 years agoMerge "Fix up multipath docker indentation"
Jenkins [Fri, 4 Aug 2017 12:31:57 +0000 (12:31 +0000)]
Merge "Fix up multipath docker indentation"

7 years agoMerge "Adds environment file for ODL + SRIOV"
Jenkins [Fri, 4 Aug 2017 10:16:42 +0000 (10:16 +0000)]
Merge "Adds environment file for ODL + SRIOV"

7 years agoMerge "Changing the default port-binding configuration"
Jenkins [Fri, 4 Aug 2017 06:33:48 +0000 (06:33 +0000)]
Merge "Changing the default port-binding configuration"

7 years agoUpdate EventPipelinePublisher param description to include zaqar
Pradeep Kilambi [Thu, 27 Jul 2017 13:53:59 +0000 (09:53 -0400)]
Update EventPipelinePublisher param description to include zaqar

Since we now support zaqar:// publisher, Enhance the description to indicate
how to set the zaqar publisher.

Change-Id: Ib7eba98d199fade2346620672e33b74686d4685b

7 years agoMerge "Make UpgradeLevelNovaCompute parameters consistent"
Jenkins [Thu, 3 Aug 2017 21:53:09 +0000 (21:53 +0000)]
Merge "Make UpgradeLevelNovaCompute parameters consistent"

7 years agoMerge "Add environment for setting a custom domain name"
Jenkins [Thu, 3 Aug 2017 21:52:28 +0000 (21:52 +0000)]
Merge "Add environment for setting a custom domain name"

7 years agoMerge "Update capabilities map to match latest environments"
Jenkins [Thu, 3 Aug 2017 17:59:45 +0000 (17:59 +0000)]
Merge "Update capabilities map to match latest environments"

7 years agoMerge "Make many networking parameters consistent"
Jenkins [Thu, 3 Aug 2017 14:19:44 +0000 (14:19 +0000)]
Merge "Make many networking parameters consistent"

7 years agoMerge "Fix CA file bind mounting in containers"
Jenkins [Thu, 3 Aug 2017 06:46:16 +0000 (06:46 +0000)]
Merge "Fix CA file bind mounting in containers"

7 years agoMerge "Render isolated network templates using jinja2"
Jenkins [Thu, 3 Aug 2017 04:30:48 +0000 (04:30 +0000)]
Merge "Render isolated network templates using jinja2"

7 years agoMerge "Make RoleParameters and key_name descriptions consistent"
Jenkins [Thu, 3 Aug 2017 01:40:17 +0000 (01:40 +0000)]
Merge "Make RoleParameters and key_name descriptions consistent"

7 years agoMerge "Set redis password hiera value in compute agent"
Jenkins [Thu, 3 Aug 2017 01:02:42 +0000 (01:02 +0000)]
Merge "Set redis password hiera value in compute agent"

7 years agoMerge "Cinder volume/backup containers shouldn't mount two paths at same point"
Jenkins [Thu, 3 Aug 2017 01:02:35 +0000 (01:02 +0000)]
Merge "Cinder volume/backup containers shouldn't mount two paths at same point"

7 years agoMerge "Update TLS-everywhere docker environment"
Jenkins [Thu, 3 Aug 2017 00:45:30 +0000 (00:45 +0000)]
Merge "Update TLS-everywhere docker environment"

7 years agoMerge "Fix keystone, cinder, heat-api cron containers"
Jenkins [Thu, 3 Aug 2017 00:44:41 +0000 (00:44 +0000)]
Merge "Fix keystone, cinder, heat-api cron containers"

7 years agoMake UpgradeLevelNovaCompute parameters consistent
Ben Nemec [Fri, 14 Jul 2017 20:36:56 +0000 (15:36 -0500)]
Make UpgradeLevelNovaCompute parameters consistent

There is logic in nova-base.yaml that depends on the default for
this parameter being '', and the nova-compute service only needs it
set to auto during upgrade.  That will be done by [1] anyway, so it
doesn't matter what the default is.  It's also not clear to me that
the nova-compute task is even needed now that we're post-Ocata, but
that's not a change I feel comfortable making.

1: https://github.com/openstack/tripleo-heat-templates/blob/master/environments/major-upgrade-composable-steps.yaml

Change-Id: Iccfcb5b68e406db1b942375803cfedbb929b4307
Partial-Bug: 1700664

7 years agoMake many networking parameters consistent
Ben Nemec [Thu, 13 Jul 2017 18:14:51 +0000 (13:14 -0500)]
Make many networking parameters consistent

These are mostly the low hanging fruit that only required a few
minor changes to fix.  There are more that require a lot of changes
or might be more controversial that will be done later.

Change-Id: I55cebc92ef37a3bb167f5fae0debe77339395e62
Partial-Bug: 1700664

7 years agoMake RoleParameters and key_name descriptions consistent
Ben Nemec [Tue, 27 Jun 2017 16:07:52 +0000 (11:07 -0500)]
Make RoleParameters and key_name descriptions consistent

The key_name default is ignored because the parameter is used in
some mutually exclusive environments where the default doesn't
need to be the same.

Change-Id: I77c1a1159fae38d03b0e59b80ae6bee491d734d7
Partial-Bug: 1700664

7 years agoMerge "Fix ceilometer agent compute service name"
Jenkins [Wed, 2 Aug 2017 21:04:45 +0000 (21:04 +0000)]
Merge "Fix ceilometer agent compute service name"

7 years agoUpdate capabilities map to match latest environments
Jiri Tomasek [Fri, 14 Jul 2017 09:12:44 +0000 (11:12 +0200)]
Update capabilities map to match latest environments

This change updates capabilities-map.yaml to properly map existing
environments

Closes-Bug: 1708159
Change-Id: I4104b6b59b3e9b19a06cdc233dae4f68fe033580

7 years agoFix up multipath docker indentation
Michele Baldessari [Wed, 2 Aug 2017 09:55:23 +0000 (11:55 +0200)]
Fix up multipath docker indentation

Deploying a multipathd container gives the following error:
failed: [localhost] (item={'key': u'config_files', 'value': [{u'dest': u'/', u'merge': True, u'source':
u'/var/lib/kolla/config_files/src-iscsid/*', u'preserve_properties': True}]}) =>
{\"checksum\": \"72ad81489381571c5043b7613f6828b06ae364bd\", \"failed\": true, \"item\":
{\"key\": \"config_files\", \"value\": [{\"dest\": \"/\", \"merge\": true, \"preserve_properties\": true,
\"source\": \"/var/lib/kolla/config_files/src-iscsid/*\"}]}, \"msg\": \"Destination directory does not exist\"}

The reason is the wrong indentation of the config_files key in the
multipath docker service.

Change-Id: I0e1fbb9eb188a903994b9e5da90ab4a6fb81f00a
Closes-Bug: #1708129

7 years agoMerge "Fix iscsid role data's section"
Jenkins [Wed, 2 Aug 2017 05:11:22 +0000 (05:11 +0000)]
Merge "Fix iscsid role data's section"

7 years agoCinder volume/backup containers shouldn't mount two paths at same point
John Fulton [Wed, 2 Aug 2017 02:54:56 +0000 (02:54 +0000)]
Cinder volume/backup containers shouldn't mount two paths at same point

Docker refuses to start the container because config_files/src-ceph:ro
is mounted at both /etc/ceph and config-data/puppet-generated/ceph.
The mount to /var/lib/config-data/puppet-generated/ceph should have
been removed in commit ed0b77ff93a1a1e071d32f6a758e04c6d0b041ef.

Change-Id: I411b4764a54fc21e97e4c41a5fef00c7e6e2b64d
Closes-Bug: #1707956

7 years agoMerge "Fix network-isolation.j2.yaml to ignore VIPs for disabled networks"
Jenkins [Wed, 2 Aug 2017 01:35:47 +0000 (01:35 +0000)]
Merge "Fix network-isolation.j2.yaml to ignore VIPs for disabled networks"

7 years agoMerge "Remove empty metadata_settings from iscsid and multipathd templates"
Jenkins [Wed, 2 Aug 2017 01:30:11 +0000 (01:30 +0000)]
Merge "Remove empty metadata_settings from iscsid and multipathd templates"

7 years agoMerge "Adds stop and disable for libvirtd on upgrade to containers"
Jenkins [Wed, 2 Aug 2017 01:29:22 +0000 (01:29 +0000)]
Merge "Adds stop and disable for libvirtd on upgrade to containers"

7 years agoSet redis password hiera value in compute agent
Pradeep Kilambi [Wed, 26 Jul 2017 15:18:40 +0000 (11:18 -0400)]
Set redis password hiera value in compute agent

Without this config defaults to undef in containers

Change-Id: Id47f365364e7b0d399de92995871b136550cd625

7 years agoFix ceilometer agent compute service name
Pradeep Kilambi [Mon, 24 Jul 2017 19:26:47 +0000 (15:26 -0400)]
Fix ceilometer agent compute service name

Make sure this matches whats in roles_data.yaml

Change-Id: Id41c457914f557af7c9ec195c4c6f98669523ac1

7 years agoMerge "Generate MySQL client config if service requires database"
Jenkins [Tue, 1 Aug 2017 20:00:18 +0000 (20:00 +0000)]
Merge "Generate MySQL client config if service requires database"

7 years agoMerge "Add missing metadata_settings from docker services"
Jenkins [Tue, 1 Aug 2017 17:20:06 +0000 (17:20 +0000)]
Merge "Add missing metadata_settings from docker services"

7 years agoAdds stop and disable for libvirtd on upgrade to containers
marios [Tue, 1 Aug 2017 14:24:18 +0000 (17:24 +0300)]
Adds stop and disable for libvirtd on upgrade to containers

Adds this into the tripleo_upgrade_node.sh executed by the
operator for the major upgrade see the bug for more info

Change-Id: Ic54b48b149594e8ea08e95152111bcdaf7b252b7
Closes-Bug: 1707926

7 years agoFix keystone, cinder, heat-api cron containers
Dan Prince [Mon, 31 Jul 2017 21:49:24 +0000 (17:49 -0400)]
Fix keystone, cinder, heat-api cron containers

The cron containers need to run as root in order to create PID files
correctly.

Additionally, the keystone_cron container was misconfigured to
use /usr/bin/cron instead of the correct /usr/bin/crond.

Additionally we have an issue where the Kolla keystone container has
hard coded ARGS for the docker container which causes -DFOREGROUND
(an Apache specific argument) to get appended onto the kolla_start
command thus causing crond to fail to startup correctly. This
works around the issue by overriding the command and calling
kolla_set_configs manually. Once we fix this in Kolla we can
revisit this.

Change-Id: Ib8fb2bef9a3bb89131265051e9ea304525b58374
Related-bug: 1707785

7 years agoFix CA file bind mounting in containers
Juan Antonio Osorio Robles [Tue, 1 Aug 2017 07:01:54 +0000 (07:01 +0000)]
Fix CA file bind mounting in containers

The syntax was wrong and wasn't actually bind mounting the CA file.
This fixes it.

Change-Id: Icfa2118ccd2a32fdc3d1af27e3e3ee02bdfbb13b

7 years agoUpdate TLS-everywhere docker environment
Juan Antonio Osorio Robles [Tue, 1 Aug 2017 05:54:05 +0000 (08:54 +0300)]
Update TLS-everywhere docker environment

Some resources have changed. So the environment needed syncing

Change-Id: I9aa310ae80edfccd3ed28e67a431aad6e1ed8a7f

7 years agoRemove empty metadata_settings from iscsid and multipathd templates
Juan Antonio Osorio Robles [Tue, 1 Aug 2017 05:42:33 +0000 (08:42 +0300)]
Remove empty metadata_settings from iscsid and multipathd templates

metadata_settings is meant to have a specific format or be completely
absent. Unfortunately the hook [1] doesn't an empty value for this. So
we remove it as an easy fix before figuring out how to add such a
functionality to the hook.

[1] https://github.com/openstack/tripleo-heat-templates/blob/master/extraconfig/nova_metadata/krb-service-principals.yaml

Co-Authored-By: Thomas Herve <therve@redhat.com>
Change-Id: Ieac62a8076e421b5c4843a3cbe1c8fa9e3825b38

7 years agoMerge "Enable Dpdk after rebooting with Hugepages for OvS2.7"
Jenkins [Mon, 31 Jul 2017 19:32:47 +0000 (19:32 +0000)]
Merge "Enable Dpdk after rebooting with Hugepages for OvS2.7"

7 years agoMerge "Fix creation of iptables rules for non-HA containerized HAproxy"
Jenkins [Mon, 31 Jul 2017 15:26:54 +0000 (15:26 +0000)]
Merge "Fix creation of iptables rules for non-HA containerized HAproxy"

7 years agoAdd missing metadata_settings from docker services
Juan Antonio Osorio Robles [Mon, 31 Jul 2017 15:22:44 +0000 (18:22 +0300)]
Add missing metadata_settings from docker services

These are needed for the TLS everywhere bits.

Change-Id: I81fcf453fc1aaa2545e0ed24013f0f13b240a102

7 years agoMerge "Add 'ovn-controller' service"
Jenkins [Mon, 31 Jul 2017 14:23:06 +0000 (14:23 +0000)]
Merge "Add 'ovn-controller' service"

7 years agoCopy scheduler configuration from service/ironic to services-docker/ironic
Dmitry Tantsur [Mon, 31 Jul 2017 13:47:23 +0000 (15:47 +0200)]
Copy scheduler configuration from service/ironic to services-docker/ironic

That was missed back then. Without it bug 1697724 is not fixed for containers.

Change-Id: Ie859f10129cbdeebd9ea4522510768cec99a1df3
Related-Bug: #1697724

7 years agoEnable Dpdk after rebooting with Hugepages for OvS2.7
Saravanan KR [Fri, 14 Jul 2017 04:11:28 +0000 (09:41 +0530)]
Enable Dpdk after rebooting with Hugepages for OvS2.7

With OvS2.7, DPDK is initialized immediately after setting
dpdk-init flag. DPDK requires hugepages configuration to be
available on kernel args with a reboot. This patch reboots
the node after applying the kernel args. And once the node
is rebooted, DPDK will be enabled and then the deployment
continues.

Change-Id: Ide442e09c2bea56a38399247de588e63b4272326

7 years agoMerge "add lbaasv2 to NeutronServicePlugins in octavia containers"
Jenkins [Sat, 29 Jul 2017 00:59:17 +0000 (00:59 +0000)]
Merge "add lbaasv2 to NeutronServicePlugins in octavia containers"

7 years agoMerge "Also log docker-puppet.py puppet output to console"
Jenkins [Fri, 28 Jul 2017 15:57:33 +0000 (15:57 +0000)]
Merge "Also log docker-puppet.py puppet output to console"

7 years agoMerge "Enable Zaqar API SSL"
Jenkins [Fri, 28 Jul 2017 15:46:58 +0000 (15:46 +0000)]
Merge "Enable Zaqar API SSL"

7 years agoAlso log docker-puppet.py puppet output to console
Bogdan Dobrelya [Fri, 28 Jul 2017 09:25:42 +0000 (11:25 +0200)]
Also log docker-puppet.py puppet output to console

Running puppet apply with --logdest syslog results in all the output
being redirected to syslog. You get no error messages. In the case where this fails, the subsequent debug task shows nothing useful
as there was no stdout/stderr.

Also pass --logdest console to docker-puppet's puppet apply so that
we get the output for the debug task.

Related-Bug: #1707030

Change-Id: I67df5eee9916237420ca646a16e188f26c828c0e
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
7 years agoMerge "Consistent hostname format env for split-stack"
Jenkins [Fri, 28 Jul 2017 02:57:20 +0000 (02:57 +0000)]
Merge "Consistent hostname format env for split-stack"

7 years agoChanging the default port-binding configuration
Itzik Brown [Thu, 20 Jul 2017 11:36:26 +0000 (14:36 +0300)]
Changing the default port-binding configuration

networking-odl no longer supports the network-topology port
binding controller and instead now relies on a pseudo-agent binding
controller.  This means that each OVS node must be configured with
host configuration in OVSDB about which VIF types, network types,
functions, etc that this OVS node supports.  The end result is this
affects where nova and neutron will schedule instances.

Changes Include:
 - Modifying default port binding controller to use pseudo agent
 - Adds necessary per role parameters to be able to configure host
   config on a per role basis to allow for heterogenous compute node
   configurations.

Change-Id: I50458abf6a8a6bf724ad97accb6444d9c497d287
Closes-Bug: 1674995
Signed-off-by: Tim Rozet <trozet@redhat.com>
7 years agoAdd 'ovn-controller' service
Numan Siddique [Thu, 13 Jul 2017 11:44:51 +0000 (17:14 +0530)]
Add 'ovn-controller' service

Presently the ovn-controller service (puppet/services/neutron-compute-plugin-ovn.yaml)
is started only on compute nodes. But for the cases where the controller nodes
provide the north/south traffic, we need ovn-controller service runninng in controller
nodes as well.

This patch
 - Renames the neutron-compute-plugin-ovn.yaml to ovn-controller.yaml which makes more
   sense and sets the service name as 'ovn-controller'.
 - Adds the service 'ovn-controller' to Controller and Compute roles.
 - Adds the missing 'upgrade_tasks' section in ovn-dbs.yaml and ovn-controller.yaml

Depends-On: Ie3f09dc70a582f3d14de093043e232820f837bc3
Depends-On: Ide11569d81f5f28bafccc168b624be505174fc53
Change-Id: Ib7747406213d18fd65b86820c1f86ee7c39f7cf5

7 years agoAlso log puppet output to console
James Slagle [Thu, 27 Jul 2017 17:59:04 +0000 (13:59 -0400)]
Also log puppet output to console

Running puppet apply with --logdest syslog results in all the output
being redirected to syslog. You get no error messages. In the case where
this ansible task fails, the subsequent debug task shows nothing useful
as there was no stdout/stderr.

Also pass --logdest console to puppet apply so that we get the output
for the debug task. My local testing showed that when specifying logdest
twice, both values were honored, and the output went to syslog and the
console.

Change-Id: Id5212b3ed27b6299e33e81ecf71ead554f9bdd29
Closes-Bug: #1707030

7 years agoGenerate MySQL client config if service requires database
Damien Ciabrini [Fri, 7 Jul 2017 14:44:26 +0000 (10:44 -0400)]
Generate MySQL client config if service requires database

Services that access database have to read an extra MySQL configuration file
/etc/my.cnf.d/tripleo.cnf which holds client-only settings, like client bind
address and SSL configuration. The configuration file is thus used by
containerized services, but also by non-containerized services that still
run on the host.

In order to generate that client configuration file appropriately both on the
host and for containers, 1) the MySQLClient service must be included by the
role; 2) every containerized service which uses the database must include the
mysql::client profile in the docker-puppet config generation step.

By including the mysql::client profile in each containerized service, we ensure
that any change in configuration file will be reflected in the service's
/var/lib/config-data/{service}, and that paunch will restart the service's
container automatically.

We now only rely on MySQLClient from puppet/services, to make it possible to
generate /etc/my.cnf.d/tripleo.cnf on the host, and to set the hiera keys that
drive the generation of that config file in containers via docker-puppet.

We include a new YAML validation step to ensure that any service which depends
on MySQL will initialize the mysql::client profile during the docker-puppet
step.

Change-Id: I0dab1dc9caef1e749f1c42cfefeba179caebc8d7

7 years agoFix iscsid role data's section
Damien Ciabrini [Thu, 27 Jul 2017 16:44:15 +0000 (12:44 -0400)]
Fix iscsid role data's section

The iscsid service definition has a typo, config_setting should
read config_settings

Change-Id: I12605dba61fd5f6ce80c3ab78e883ed5ebf3ca62

7 years agoAdd environment for setting a custom domain name
Ben Nemec [Wed, 21 Jun 2017 17:13:18 +0000 (12:13 -0500)]
Add environment for setting a custom domain name

Just setting CloudDomain won't make the domains used consistent.
There are a number of CloudName parameters that must be set as well.
This change adds a sample environment that includes all of those
parameters so it is easy to set everything consistently.

Also fixes the description of CloudNameCtlplane to reflect the
actual use for that parameter.

Change-Id: I56d1c1c5619f83c16c4e8350aa84fccc3d748425

7 years agoMerge "Add PCI to nova compute container for passthrough support"
Jenkins [Thu, 27 Jul 2017 14:10:56 +0000 (14:10 +0000)]
Merge "Add PCI to nova compute container for passthrough support"

7 years agoMerge "Enable libvirtd_config puppet tag in nova-libvirtd docker service"
Jenkins [Thu, 27 Jul 2017 11:36:48 +0000 (11:36 +0000)]
Merge "Enable libvirtd_config puppet tag in nova-libvirtd docker service"

7 years agoEnable Zaqar API SSL
Thomas Herve [Wed, 19 Jul 2017 09:13:19 +0000 (11:13 +0200)]
Enable Zaqar API SSL

This sets the SSL flag in the docker service and expose the parameter in
the docker service.

Depends-On: I4c68a662c2433398249f770ac50ba0791449fe71
Change-Id: Ic3df2b9ab7432ffbed5434943e04085a781774a0

7 years agoMerge "Deploy Ceph in containers using ceph-ansible via external workflow"
Jenkins [Thu, 27 Jul 2017 06:18:28 +0000 (06:18 +0000)]
Merge "Deploy Ceph in containers using ceph-ansible via external workflow"

7 years agoMerge "Make collectd run as root inside the container"
Jenkins [Thu, 27 Jul 2017 06:07:25 +0000 (06:07 +0000)]
Merge "Make collectd run as root inside the container"

7 years agoMerge "Adding Tuned Service"
Jenkins [Thu, 27 Jul 2017 06:06:46 +0000 (06:06 +0000)]
Merge "Adding Tuned Service"

7 years agoMerge "aodh: add gnocchi_external_project_owner config"
Jenkins [Wed, 26 Jul 2017 22:57:25 +0000 (22:57 +0000)]
Merge "aodh: add gnocchi_external_project_owner config"

7 years agoMerge "Fix enable-ceph sample environment"
Jenkins [Wed, 26 Jul 2017 22:57:18 +0000 (22:57 +0000)]
Merge "Fix enable-ceph sample environment"

7 years agoDeploy Ceph in containers using ceph-ansible via external workflow
Giulio Fidente [Thu, 25 May 2017 23:35:53 +0000 (01:35 +0200)]
Deploy Ceph in containers using ceph-ansible via external workflow

Add docker profiles to deploy Ceph in containers via ceph-ansible. This is
implemented by triggering a Mistral workflow during one of the overcloud
deployment steps, as provided by [1].

Some new service-specific parameters are available to determine the workflow to
execute and the ansible playbook to use. A new `CephAnsibleExtraConfig`
parameter can be used to provide arbitrary config variables consumed by `ceph-ansible`.

The pre-existing template params consumed up until the Pike release to
drive `puppet-ceph` continue to work and are translated, when possible, into
the equivalent `ceph-ansible` variable.

A new environment file is added to enable use of ceph-ansible;
the pre-existing puppet-ceph implementation remains unchanged and usable
for non-containerized deployments.

1. https://review.openstack.org/#/c/463324/

Change-Id: I81d44a1e198c83a4ef8b109b4eb6c611555dcdc5

7 years agoMerge "Provides Ceph config into OpenStack clients"
Jenkins [Wed, 26 Jul 2017 19:58:54 +0000 (19:58 +0000)]
Merge "Provides Ceph config into OpenStack clients"

7 years agoAdds environment file for ODL + SRIOV
Tim Rozet [Fri, 21 Jul 2017 17:41:19 +0000 (13:41 -0400)]
Adds environment file for ODL + SRIOV

Using the separate neutron-opendaylight and SRIOV env files do not work
because sriov includes using OVS agent (which ODL does not want or need)
and the default ODL env file has no Compute ML2 because it is not
needed.  Thus a new environment file is needed for deploying these 2
features in combination.

Closes-Bug: 1696667

Change-Id: I6f7a9368aa521de928c269619278c30acda03799
Signed-off-by: Tim Rozet <trozet@redhat.com>
7 years agoRender isolated network templates using jinja2
Dan Sneddon [Mon, 19 Jun 2017 18:34:05 +0000 (11:34 -0700)]
Render isolated network templates using jinja2

This change adds templates that are used to create network and
port definition templates for each network that is defined in
network_data.yaml. In order to render the templates, additional
fields have been added to the network_data.yaml file. If this
optional data is present, it will be used to populate the default
parameter values in the network template.

The only required parameters in the network_data.yaml file is
the network name. If the network will have IPv6 addresses, then
ipv6: true must be set on the network.

The existing networks have been modeled in the network_data.yaml,
but until these templates are removed from the j2_excludes.yaml
file they will not be generated on the fly. Any additional
networks will have templates generated.

This change also removes an unnecessary conditional from the
networks.j2.yaml file, since InternalApiNetwork doesn't need
to be reformatted as InternalNetwork (it's only used in this
one file).

A follow-up patch will remove the existing network definitions
so all networks are created dynamically.

Change-Id: If074f87494a46305c990a0ea332c7b576d3c6ed8
Depends-On: Iab8aca2f1fcaba0c8f109717a4b3068f629c9aab
Partially-Implements: blueprint composable-networks

7 years agoMerge "Stop Heat WSGI services on docker upgrade"
Jenkins [Wed, 26 Jul 2017 13:47:21 +0000 (13:47 +0000)]
Merge "Stop Heat WSGI services on docker upgrade"

7 years agoMerge "Ps Cinder: Added support for password less login"
Jenkins [Wed, 26 Jul 2017 13:47:14 +0000 (13:47 +0000)]
Merge "Ps Cinder: Added support for password less login"

7 years agoFix enable-ceph sample environment
Ben Nemec [Thu, 13 Jul 2017 15:44:16 +0000 (10:44 -0500)]
Fix enable-ceph sample environment

The necessary resource registry entries were missing from this env
and the old environment was not deprecated.

Change-Id: I6a9b148514fc5da1f96b9fd7fe09f564c2f82419

7 years agoMerge "Replace outdated instruction with link to upstream doc"
Jenkins [Wed, 26 Jul 2017 13:22:29 +0000 (13:22 +0000)]
Merge "Replace outdated instruction with link to upstream doc"

7 years agoMerge "Add parameters for Veritas HyperScale distributed setup."
Jenkins [Wed, 26 Jul 2017 13:22:15 +0000 (13:22 +0000)]
Merge "Add parameters for Veritas HyperScale distributed setup."

7 years agoMerge "Open up firewall for the control-ports in the bundles"
Jenkins [Wed, 26 Jul 2017 13:14:34 +0000 (13:14 +0000)]
Merge "Open up firewall for the control-ports in the bundles"

7 years agoMerge "Add NodeTLSData to generic role.role.j2.yaml"
Jenkins [Wed, 26 Jul 2017 13:14:21 +0000 (13:14 +0000)]
Merge "Add NodeTLSData to generic role.role.j2.yaml"

7 years agoMerge "Make various password descriptions consistent"
Jenkins [Wed, 26 Jul 2017 13:13:56 +0000 (13:13 +0000)]
Merge "Make various password descriptions consistent"

7 years agoMerge "Stop also openstack-swift-object-expirer when upgrading swift services"
Jenkins [Wed, 26 Jul 2017 13:13:47 +0000 (13:13 +0000)]
Merge "Stop also openstack-swift-object-expirer when upgrading swift services"

7 years agoMerge "Contrail network realignement + DPDK enablement"
Jenkins [Wed, 26 Jul 2017 11:21:46 +0000 (11:21 +0000)]
Merge "Contrail network realignement + DPDK enablement"

7 years agoMerge "Add keystone cron container to run token_flush"
Jenkins [Wed, 26 Jul 2017 09:26:06 +0000 (09:26 +0000)]
Merge "Add keystone cron container to run token_flush"

7 years agoMerge "nova_api_cron docker fix: add /var/spool/cron/nova"
Jenkins [Wed, 26 Jul 2017 08:55:52 +0000 (08:55 +0000)]
Merge "nova_api_cron docker fix: add /var/spool/cron/nova"

7 years agoMerge "Add containerized manila-share to CI"
Jenkins [Wed, 26 Jul 2017 06:19:09 +0000 (06:19 +0000)]
Merge "Add containerized manila-share to CI"

7 years agoFix creation of iptables rules for non-HA containerized HAproxy
Damien Ciabrini [Wed, 14 Jun 2017 11:52:33 +0000 (07:52 -0400)]
Fix creation of iptables rules for non-HA containerized HAproxy

The introduction of I90253412a5e2cd8e56e74cce3548064c06d022b1 broke the HAproxy
service due to some HAproxy-specific iptables rules being executed during the
puppet config step.

Ensure that no iptables call is performed during the generation of configuration
files. Move those calls to step 1, as implemented in the pacemaker-based
HAproxy service (Ib5a083ba3299a82645f1a0f9da0d482c6b89ee23).

Depends-On: I2d6274d061039a9793ad162ed8e750bd87bf71e9
Closes-Bug: #1697921

Change-Id: Ica3a432ff4a9e7a46df22cddba9ad96e1390b665

7 years agoAdd NodeTLSData to generic role.role.j2.yaml
Steven Hardy [Tue, 4 Jul 2017 17:08:10 +0000 (18:08 +0100)]
Add NodeTLSData to generic role.role.j2.yaml

This is currently included in the controller-role template, so we need
to add it to the generic role.role.j2.yaml in order to convert the
controller-role template to be rendered via j2

Change-Id: I01bf01c8a31e4cc26f202dd1774845ec33f50bcd
Partially-Implements: blueprint composable-networks

7 years agoMerge "Add cinder cron container to run db purge"
Jenkins [Tue, 25 Jul 2017 22:08:49 +0000 (22:08 +0000)]
Merge "Add cinder cron container to run db purge"

7 years agoProvides Ceph config into OpenStack clients
Giulio Fidente [Tue, 11 Jul 2017 10:20:05 +0000 (12:20 +0200)]
Provides Ceph config into OpenStack clients

Given ceph-ansible or puppet-ceph will have created the Ceph
config files and keyrings in /etc/ceph on baremetal, this change
copies into the OpenStack containers the necessary files for the
services to be able to connect to the Ceph cluster.

Change-Id: Ibc9964902637429209d4e1c1563b462c60090365

7 years agoEnable libvirtd_config puppet tag in nova-libvirtd docker service
Oliver Walsh [Tue, 25 Jul 2017 21:54:56 +0000 (22:54 +0100)]
Enable libvirtd_config puppet tag in nova-libvirtd docker service

Required now that https://review.openstack.org/480289 has merged

Change-Id: I17f6c9b5a6e2120a53bae296042ece492210597a
Related-Bug: #1696504

7 years agoMerge "Add heat api container to run cron purge_deleted"
Jenkins [Tue, 25 Jul 2017 21:28:22 +0000 (21:28 +0000)]
Merge "Add heat api container to run cron purge_deleted"

7 years agoAdding Tuned Service
Joe Talerico [Thu, 6 Apr 2017 11:38:59 +0000 (07:38 -0400)]
Adding Tuned Service

Allow the user to set a specific Tuned profile on a given host.

Defaults to throughput-performance

Change-Id: I0c66193d2733b7a82ad44b1cd0d2187dd732065a

7 years agoContrail network realignement + DPDK enablement
Michael Henkel [Fri, 16 Jun 2017 18:02:59 +0000 (11:02 -0700)]
Contrail network realignement + DPDK enablement

This patch moves Contrail roles communication from public/external
to internal_api network for OpenStack API.
It also adds the option to enable dpdk.
Monolithic firstboot script is broken down into small pre-network
and per-node extraconfig scripts

Change-Id: I296a3bf60cef6fa950fd71d6e68effe367d1e66b
Closes-Bug: 1698422

7 years agoMerge "Fall back to non-containerized cinder-backup and cinder-volume for HA"
Jenkins [Tue, 25 Jul 2017 14:59:34 +0000 (14:59 +0000)]
Merge "Fall back to non-containerized cinder-backup and cinder-volume for HA"

7 years agoadd lbaasv2 to NeutronServicePlugins in octavia containers
Or Idgar [Tue, 25 Jul 2017 10:37:13 +0000 (13:37 +0300)]
add lbaasv2 to NeutronServicePlugins in octavia containers

without lbaasv2 neutron will not be able to load the plugin
and communicate with octavia.

Change-Id: If44b93703d3c408ae075d73ed695c3edc58fba18

7 years agoMerge "Modifying Cisco templates to support composable roles"
Jenkins [Tue, 25 Jul 2017 05:56:33 +0000 (05:56 +0000)]
Merge "Modifying Cisco templates to support composable roles"

7 years agoMerge "Increase default RabbitMQ/Erlang TCP timeout from 5 to 15 seconds"
Jenkins [Tue, 25 Jul 2017 05:56:06 +0000 (05:56 +0000)]
Merge "Increase default RabbitMQ/Erlang TCP timeout from 5 to 15 seconds"

7 years agoMerge "Mount /var/lib/neutron in neutron agents for metadata proxy"
Jenkins [Tue, 25 Jul 2017 05:11:52 +0000 (05:11 +0000)]
Merge "Mount /var/lib/neutron in neutron agents for metadata proxy"

7 years agoMerge "Add metadata_settings in Heat APIs"
Jenkins [Tue, 25 Jul 2017 05:11:45 +0000 (05:11 +0000)]
Merge "Add metadata_settings in Heat APIs"

7 years agoMerge "CI/scenarios : Add scenario007 for OVN services"
Jenkins [Tue, 25 Jul 2017 00:53:46 +0000 (00:53 +0000)]
Merge "CI/scenarios : Add scenario007 for OVN services"

7 years agoModifying Cisco templates to support composable roles
Sandhya Dasu [Tue, 18 Jul 2017 15:44:17 +0000 (11:44 -0400)]
Modifying Cisco templates to support composable roles

Change-Id: I21fee832aeeb9780f818ae869ea8714f28bbe4a0
Closes-bug:  #1704853

7 years agoMerge "Revert "Disable systemd-networkd & systemd-resolved""
Jenkins [Mon, 24 Jul 2017 20:47:16 +0000 (20:47 +0000)]
Merge "Revert "Disable systemd-networkd & systemd-resolved""

7 years agoConsistent hostname format env for split-stack
James Slagle [Mon, 24 Jul 2017 18:39:23 +0000 (14:39 -0400)]
Consistent hostname format env for split-stack

Adds a new environment split-stack-consistent-hostname-format.j2.yaml
for use with split-stack that will set the {{role.name}}HostnameFormat
parameters based on the actual roles in use.

It's possible to generate these parameters and values as long as the
roles files is the same between the 2 stacks, which will be documented
in I9997bd685f8f79537dfc377f9f1eb0c7446c3289.

Removes the hardcoded paramters from the other 2 split-stack
environments.

Change-Id: I93bc7c1a24a9cb2f9930372970c67c0eadb14add

7 years agoMerge "Set name property on missing deployments"
Jenkins [Mon, 24 Jul 2017 18:41:06 +0000 (18:41 +0000)]
Merge "Set name property on missing deployments"

7 years agoMerge "Use static environment for deployed-server neutron mappings"
Jenkins [Mon, 24 Jul 2017 18:14:22 +0000 (18:14 +0000)]
Merge "Use static environment for deployed-server neutron mappings"

7 years agoMerge "Move docker_puppet_tasks calculation into services.yaml"
Jenkins [Mon, 24 Jul 2017 18:06:20 +0000 (18:06 +0000)]
Merge "Move docker_puppet_tasks calculation into services.yaml"