203 Commits

Author SHA1 Message Date
Jenkins
7b02ad73fb Merge "Don't assume default network names in net_ip*map" 2017-02-25 16:38:11 +00:00
Steven Hardy
47f2579fa2 Don't assume default network names in net_ip*map
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-17 13:38:31 +00:00
Dan Radez
f666228678 adding Congress Support
Depends-On: Ic74ccd5fa7b3b04ca810416e5160463252f17474

Implements: blueprint congress-service-integration

Change-Id: Ie60540c340c0eb71ff376aba65507a8bb3e909b6
Signed-off-by: Dan Radez <dradez@redhat.com>
2017-02-10 09:59:38 -05:00
Dan Radez
b49b443ea7 Adding Tacker Support
Depends-On: Ide0e60f3b7a3733788af4337c1c39b4a956c876f
Depends-On: I3d6bbc05644e840395f87333ec80e3b844f69903
Depends-On: Idf6abcb7fe766546cb362ad4afe54f4bccd9c994

Implements: blueprint tacker-service-integration

Change-Id: Ibddc81561f6e6ba671bd01a9251c57d3ad67ba8c
Signed-off-by: Dan Radez <dradez@redhat.com>
2017-02-09 20:23:36 +00:00
Jenkins
f190469c01 Merge "Re-organizes Contrail services to the correct roles" 2017-02-09 17:02:55 +00:00
Michael Henkel
da91bb6e1e Re-organizes Contrail services to the correct roles
In current setup some Contrail services belong to the wrong roles.
The Contrail control plane can be impacted if the Analytics database has
problems.

Change-Id: I0d57a2324c38b5b20cc687c6217a7a364941f7e6
Depends-On: Id0dd35b95c5fe9d0fcc1e16c4b7d6cc601f10818
Closes-Bug: #1659560
2017-02-08 20:25:41 +01:00
Jenkins
2527e459e2 Merge "Configure VNC Server listen address through t-h-t" 2017-02-03 21:40:04 +00:00
Juan Antonio Osorio Robles
2ca1624028 Add more explicit messagae to build_endpoint_map's check option
This will hopefully help developers know what to do if their patch fails
this verification.

Change-Id: I01fe9ca30295c6264affdbdb773b039a744289ea
2017-02-01 23:09:03 +02:00
Juan Antonio Osorio Robles
064f7d6b44 Configure VNC Server listen address through t-h-t
This adds an entry for libvirt (which is used by the VNC server) on
which we can tell it via t-h-t on which IP address to listen on.

Change-Id: Ie377c09734e9f6170daa519aed69c53fc67c366b
Related-Bug: #1660099
2017-02-01 22:35:42 +02:00
Jenkins
7dbd771a35 Merge "Add Octavia API service definitions" 2017-01-25 20:50:25 +00:00
Jenkins
8ab1918f02 Merge "Add ec2-api service" 2017-01-25 20:49:56 +00:00
Sven Anderson
e02c3c2962 Add ec2-api service
This change adds the ec2api service using the
tripleo::profile::base::nova::ec2api profile.

The deprecated nova-cert service is not supported, and therefore the
RegisterImage action is not supported either.

Change-Id: I2510fd4ed935d8423216fff9ce3adf2d69c9c804
Depends-On: If4b091e1ca02f43aa9c65392baf8ceea007b7cfb
2017-01-24 16:34:00 +00:00
Michele Baldessari
cf8c1ebdd3 pacemaker remote profile support
This adds a pacemaker_remote puppet service so that an operator
can automatically deploy pacemaker-remote on nodes of his choice.

Change-Id: I9678606b3de9b9f4c03014b33c1dd27fcba67513
Depends-On: I581552dfa64160e2f82f6a9b8f2ae521c3d6da8d
Depends-On: I92953afcc7d536d387381f08164cae8b52f41605
2017-01-24 12:18:14 +01:00
Jenkins
ca6306ae4a Merge "Make ServiceNetMap support custom network names" 2017-01-20 17:13:09 +00:00
Jenkins
6551bec38f Merge "Adds etcd composable service" 2017-01-19 22:07:21 +00:00
Jenkins
b2aca9cb9f Merge "Add entry in serviceNetMap for Nova Placement" 2017-01-19 19:23:20 +00:00
Steven Hardy
24952e016f Make ServiceNetMap support custom network names
The rework to support custom roles moved the service net map
into a nested stack, but the logic it contains fails to consider
operators may override the network names via *NetName parameters.

So add a map_replace of the ServiceNetMapDefaults so we maintain
the existing default service->network assignments, even when the
network name is changed.

Note that operators will still be expected to pass any ServiceNetMap
overrides with the "new" network name, e.g whatever *NetName specifies,
otherwise I think environment files could get very confusing.

Change-Id: I52018e19428e11d26650f0ea6ccee3ae02494ff8
Partial-Bug: #1651541
2017-01-19 17:31:14 +00:00
Feng Pan
52573dace5 Adds etcd composable service
etcd is used by networking-vpp ML2 driver as the messaging mechanism. This
patch adds etcd service which can be used by other services.

Implements: blueprint fdio-integration-tripleo

Depends-on: Idaa3e3deddf9be3d278e90b569466c2717e2d517

Change-Id: I8ae1e2c9b0c3d6f448e1da712100938d011289f5
Signed-off-by: Feng Pan <fpan@redhat.com>
2017-01-19 00:00:39 -05:00
Juan Antonio Osorio Robles
c644d83d01 Add entry in serviceNetMap for Nova Placement
This is needed for t-h-t to autogenerate the hostnames and the vip
entries in hiera. It also takes it into use in the endpoint map.

Change-Id: Id0d34c7c3939ee81126ffd26d0658c0a87805a44
2017-01-19 00:34:23 +02:00
Brent Eagles
51fa5a5292 Add Octavia API service definitions
Introduce basic configuration support for Octavia API service.

Change-Id: I8816725ed65039af4b7d45392a2823395e81e51c
Depends-On: I77783029797be4fb488c6e743c51d228eba9c474
Partially-Implements: blueprint octavia-service-integration
2017-01-18 15:14:54 -03:30
Steve Baker
22ffadd325 set -e in run-os-net-config.sh
This runs run-os-net-config.sh with set -e except for ping and
os-net-config --detailed-exit-codes which are expected to return
non-zero values.

Change-Id: Iffe00a97612ccb1c79ed037ce93f6c2e685164d9
2017-01-18 11:06:29 +11:00
Jenkins
97488b8ba3 Merge "Remove Glance Registry service" 2017-01-18 00:05:11 +00:00
Emilien Macchi
26ae162564 Nova Placement API composable service
Add support to deploy Nova Placement API service in TripleO.

Change-Id: Ie41ebc362a0695c8f55419e231100c63007405ed
2017-01-17 16:23:16 +00:00
Emilien Macchi
4ccb27ab81 Remove Glance Registry service
Glance registry is not required for the v2 of the API and there are
plans to deprecate it in the glance community.

Let's remove v1 support since it has been deprecated for a while in
Glance.

Depends-On: I77db1e1789fba0fb8ac014d6d1f8f5a8ae98ae84
Co-Authored: Flavio Percoco <flaper87@gmail.com>
Change-Id: I0cd722e8c5a43fd19336e23a7fada71c257a8e2d
2017-01-16 17:04:19 -05:00
Juan Antonio Osorio Robles
9087536cea Fix protocol for ZaqarWebsockets endpoint
We needed to set the 'ws' protocol so we would get the correct endpoint
map generated when using build_endpoint_map.py

Change-Id: I6f2cfce058a803f1925c4e22f9791d0117a6c0e3
2017-01-11 18:37:15 +02:00
Juan Antonio Osorio Robles
f25458dce4 Make build_endpoint_map.py output an ocata versioned template
the version it was using was 2015-04-30, but we should be using ocata
instead.

Change-Id: I3eca2f235b3623f08e9cd6b7c2eafe0959b2fb3c
2017-01-11 18:35:19 +02:00
Dan Prince
b1fe2e8d60 Template and role support for the undercloud
Add a new roles data YAML file and environment to help
create the undercloud via t-h-t.

Partially-implements: blueprint heat-undercloud

Change-Id: I36df7fa86c2ff40026d59f02248af529a4a81861
2017-01-06 20:01:14 -05:00
Jenkins
6b8c34b27a Merge "Bump template version for all templates to "ocata"" 2017-01-03 10:31:44 +00:00
Jenkins
4c25c57c49 Merge "Split OVN northd and ml2 plugin" 2016-12-23 12:45:49 +00:00
Steven Hardy
3c6ec654b4 Bump template version for all templates to "ocata"
Heat now supports release name aliases, so we can replace
the inconsistent mix of date related versions with one consistent
version that aligns with the supported version of heat for this
t-h-t branch.

This should also help new users who sometimes copy/paste old templates
and discover intrinsic functions in the t-h-t docs don't work because
their template version is too old.

Change-Id: Ib415e7290fea27447460baa280291492df197e54
2016-12-23 11:43:39 +00:00
Jenkins
3de4f828b4 Merge "Add network_config_hook interface to run-os-net-config.sh" 2016-12-23 11:16:44 +00:00
Jenkins
a63c2273ed Merge "Use ws instead of http for Zaqar websocket endpoints" 2016-12-22 23:14:17 +00:00
James Slagle
20f627c0f0 Add network_config_hook interface to run-os-net-config.sh
run-os-net-config.sh only allows for limited customization of the
network configuration in config.json. Namely, it only customizes the
bridge_name and interface_name.

This will likely not be sufficient for all use cases. This patch adds a
generic network_config_hook bash function that will be called if it is
defined. The function is an entry point for deployers to write custom
code to further influence run-os-net-config.sh.

A possible alternative approach would be to pass the server resource
into the NetworkConfig template. That would allow running arbitrary
SoftwareDeployments on the server before NetworkDeployment is executed.
However, the interface of NetworkDeployment is likely still not as
flexible as this approach as the inputs are hardcoded in the role
template files (role.role.j2.yaml), which are not meant to be modified
by deployers.

The immediate use case for this work is using os-net-config in our
multinode CI jobs where we need to create vxlan tunnels between the
nodes and we need to know the local private IP of each node for the
tunnel endpoint. As the IP is different for each node, it's not a
parameter we could specify in the templates.

Change-Id: I26d0ebdaba6fcd3fe885e41ed234eb79a2405228
Implements: blueprint multinode-ci-os-net-config
2016-12-22 08:34:06 -05:00
Jenkins
58f3d248ba Merge "Add a per service bootstrap node variable" 2016-12-22 11:58:32 +00:00
Michele Baldessari
8d796ea0e4 Add a per service bootstrap node variable
In order to call commands that need to be run on a single node, we
create a new per-service variable that will contain the first node of
each role containing the service.

Change-Id: I03e8685f939e8ae1fcd8b16883b559615042505d
Partial-Bug: #1615983
2016-12-21 11:52:57 +01:00
Jenkins
aed9e1b9c1 Merge "net-conf: make bridge and interface name optional" 2016-12-21 09:36:29 +00:00
Dan Prince
5d777f38e7 Use ws instead of http for Zaqar websocket endpoints
This patch updates the endpoint map for Zaqar websockets
so that we use ws (or wss for SSL) instead of the http varients.
This should help resolve protocol issues when trying to make
connections to the websocket API.

Change-Id: Iea88d1e30299cb621424740a39d498defa371ca4
2016-12-20 10:06:34 -05:00
Steven Hardy
d169989598 Split OVN northd and ml2 plugin
This allows us to take advantage of the composable roles hiera
settings to connect the plugin to the northd/ovndb API without
needing to hard-code the IP of the node running the service.

Change-Id: I2508d48f81c1819ae3521fff271c0bdc50724604
Depends-On: I9af7bd837c340c3df016fc7ad4238b2941ba7a95
Closes-Bug: #1634171
2016-12-19 12:30:21 +05:30
Dan Prince
c6f4d5bf90 net-conf: make bridge and interface name optional
Update the run-os-net-config.sh so that we make the
bridge_name and interface_name parameters (supplied by
the SoftwareConfig) optional. This allows operators to
create custom network templates to be used on roles other than
compute and controller which appear to be the only two roles which
set bridge_name and interface_name parameters.

Change-Id: I8997cf8177c1bf0e1f19de5f93dc4e81da1a951f
2016-12-17 09:46:03 -05:00
Dan Prince
b3e5f8e821 Add ZaqarApiNetwork to the service net map
Without this Zaqar API will fail to run due to a missing bind
IP address in the config file.

Change-Id: Icd0a6e85b7455e89f37f05399146d5e743359da8
Closes-bug: #1650307
2016-12-15 10:23:12 -05:00
Dan Sneddon
8e5652ec8d 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
2016-12-02 10:12:17 -08:00
Jenkins
21303cd9fc Merge "Composable Zaqar services" 2016-12-02 12:08:37 +00:00
Dan Prince
2985cd9a3a 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
2016-11-28 14:23:11 -05:00
Jenkins
597de6ec40 Merge "Cleanup some inline comments in network/config" 2016-11-27 19:31:39 +00:00
Dan Prince
e2e0f9db0c Cleanup some inline comments in network/config
This patch cleans up some inline comments that are a bit
non-standardly formatted so that we can more easily parse
these templates in an automated fashion.

Change-Id: Ibf91f3478fd894f9323d8805729ece9c5fab256f
2016-11-23 10:35:07 -05:00
Pradeep Kilambi
a2e0aa4d1c Add panko api support to service templates
This integrates panko service api into tripleo heat templates.
By default, we will disable this service, an environment service
file is included to enable if needed.

Depends-On: I35f283bdf8dd0ed979c65633724f0464695130a4

Change-Id: I07da3030c6dc69cce7327b54091da15a0c58798e
2016-11-17 13:39:34 -05:00
Brad P. Crochet
20f8fd1c38 Composable Zaqar services
Adds new puppet and puppet pacemaker specific services for Zaqar.

The Pacemaker templates extend the default Zaqar services and swap in
the Pacemaker specific puppet-tripleo profile instead.

Change-Id: Ia5ca4fe317339dd05b0fa3d5abebca6ca5066bce
Depends-On: Ie215289a7be681a2b1aa5495d3f965c005d62f52
Depends-On: I0b077e85ba5fcd9fdfd33956cf33ce2403fcb088
Implements: blueprint composable-services-within-roles
2016-11-14 13:06:33 -05:00
Jenkins
d106161466 Merge "Add Barbican to the overcloud" 2016-11-01 17:27:20 +00:00
Brad P. Crochet
9dfc243202 Composable Mistral services
Adds new puppet specific services for Mistral
API and Mistral Engine.

This submission enables the mistral service by default in the
overcloud, a following submission will disable it and make it
optional by enabling it on demand based in an environment file.

Depends-On: Iae42ffa37c4c9b1e070b7c3753e04c45bb97703f
Depends-On: I942d419be951651e305d01460f394870c30a9878
Depends-On: I6cb2cbf4a2abf494668d24b8c36b0d525643f0af
Implements: blueprint composable-services-within-roles
Co-Authored-By: Carlos Camacho <ccamacho@redhat.com>

Change-Id: Id5ff9cb498b5a47af38413d211ff0ed6ccd0015b
2016-10-21 08:07:08 -04:00
Ade Lee
5f2f5422d7 Add Barbican to the overcloud
Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Depends-On: If2804b469eb3ee08f3f194c7dd3290d23a245a7a
Depends-On: I091ecfbcb2e38fe77203244ac7a597aedcb558fb
Change-Id: Iacc504fc4fa2d06893917024ce2340d3fb80b626
2016-10-19 06:40:08 +00:00