9092 Commits

Author SHA1 Message Date
Harald Jensås
00cecfe2f3 Add a tag's containing subnet cidr to ctlplane network
Since the ctlplane network and it's subnets are created
outside of the overcloud heat templates we cannot in an
easy way create a list containing the cidr of each of
the ctlplane subnets in THT.

Prior to routed networks we only had one subnet and was
able to create the NetCidrMapValue by reading the cidr
value of one of the ControlVirtualIP resource. When we
have multiple subnets on each network we should make
NetCidrMapValue contain lists of cidrs for each network.

By setting a tags on the ctlplane network, one
per subnet, containing each individual subnets cidr the
tags can be loaded via the ControlVirtualIP resource so
that we can have NetCidrMapValue contain all the cidrs
of the ctlplane network.

Change-Id: I7d9a951d0c156c83430c1e326bc8edcb52b08537
Partial: blueprint tripleo-routed-networks-templates
2019-01-06 18:20:05 +01:00
Zuul
fdba8a89e3 Merge "Allow customization of more openshift-ansible vars" 2019-01-05 12:14:20 +00:00
Zuul
5488e61c35 Merge "Update auth parameters" 2019-01-05 02:47:11 +00:00
Zuul
df10ea7afa Merge "Add template code to configure hsm backends for barbican" 2019-01-05 02:47:09 +00:00
Zuul
0e68a0e30f Merge "L3 routed networks - subnet fixed_ips (3/3)" 2019-01-04 20:38:01 +00:00
Zuul
6a81b393c9 Merge "Move [neutron] auth_url to KeystoneV3Internal" 2019-01-04 11:14:51 +00:00
Zuul
e0723c59b2 Merge "L3 routed networks - network.j2 (2/3)" 2019-01-04 04:31:44 +00:00
Zuul
da3348b470 Merge "L3 routed networks - data + env (1/3)" 2019-01-04 04:31:41 +00:00
Zuul
c4fb84b044 Merge "Fix a typo of "rabbitmq"" 2019-01-04 03:02:01 +00:00
Zuul
e286e2175e Merge "Exclude redundant letters" 2019-01-04 02:42:42 +00:00
Zuul
2465d03032 Merge "Change openstack-dev to openstack-discuss" 2019-01-04 02:42:40 +00:00
Zuul
1980cfd3a4 Merge "Fix and consolidate cinder-backup host prep tasks" 2019-01-03 19:03:20 +00:00
Zuul
2346d52362 Merge "Flatten Zaqar service configuration" 2019-01-03 19:03:17 +00:00
Zuul
98ac59b933 Merge "Introduce container_cli hiera key" 2019-01-03 19:03:14 +00:00
Zuul
08a36109eb Merge "Add missing role_specific tag for NUMA aware vswitches params" 2019-01-03 19:03:12 +00:00
Harald Jensås
2f2d8183e6 L3 routed networks - subnet fixed_ips (3/3)
When using neutron routed networks we need to specify
either the subnet or a ip address in the fixed-ips-request
when creating neutron ports.

a) For the Vip's:

Adds VipSubnetMap and VipSubnetMapDefaults parameters in
service_net_map.yaml. The two maps are merged, so that the
operator can override the subnet where VIP port should be
hosted. For example:

parameter_defaults:
  VipSubnetMap:
    ctlplane: ctlplane-leaf1
    InternalApi: internal_api_leaf1
    Storage: storage_leaf1
    redis: internal_api_leaf1

b) For overcloud node ports:

Enrich 'networks' in roles defenition to include both
network and subnet data. Changes the list to a map
instead of a list of strings. New schema:

- name: <role_name>
  networks:
    <network_name>
      subnet: <subnet_name>

For backward compatibility a conditional is used to check
if the data is a map or not. In either case the internal
list of role networks is created as '_role_networks' in
the jinja2 templates.

When the data is a map, and the map contains the 'subnet'
key the subnet specified in roles_data.yaml is used as
the subnet in the fixed-ips-reqest when ports are created.
If subnet is not set (or role.networks is not a map) the
default will be {{network.name_lower}}_subnet.

Also, since the fixed_ips request passed to Vip ports are no
longer [] by default, the conditinal has been updated to
test for 'ip_address' entries in the request.

Partial: blueprint tripleo-routed-networks-templates
Depends-On: I773a38fd903fe287132151a4d178326a46890969
Change-Id: I77edc82723d00bfece6752b5dd2c79137db93443
2019-01-03 19:07:20 +01:00
Zuul
697cefb95e Merge "Add keystone::wsgi::apache::api_port" 2019-01-03 09:55:01 +00:00
Zuul
c8094771b4 Merge "Use calculated undercloud ctlplane DHCP allocation pools" 2019-01-03 09:54:59 +00:00
Zuul
e4343bad03 Merge "Replace tripleo scenario004-multinode with scenario004-standalone" 2019-01-03 08:51:55 +00:00
Zuul
98f4bfbee4 Merge "Replace scenario004 multinode with standalone" 2019-01-03 08:37:53 +00:00
Zuul
1654d371d3 Merge "Add deprecated_server_resource_name for ObjectStorage role" 2019-01-03 08:10:43 +00:00
Zuul
8ab215a0ad Merge "Fix the scenario007 CI job failure" 2019-01-03 08:04:24 +00:00
Zuul
990e458d05 Merge "Don't require files key in env-generator" 2019-01-03 08:04:22 +00:00
Zuul
3619ca4d00 Merge "CiscoNexus: Update and Remove deprecated vars" 2019-01-03 07:47:55 +00:00
Zuul
da38d3d3f2 Merge "Align novajoin container logging to other services" 2019-01-03 07:41:10 +00:00
Zuul
9f27a86ab0 Merge "Disable deprecated parameter ControllerEnableSwiftStorage" 2019-01-03 05:46:14 +00:00
Zuul
4fe86d2f41 Merge "Fix Octavia hieradata keys" 2019-01-03 05:46:11 +00:00
Zuul
35f01e48c3 Merge "Process the templates even if j2_excludes file is not present" 2019-01-03 05:43:14 +00:00
Zuul
ea7b1134ac Merge "Include cpu plugin in default collect plugins" 2019-01-03 05:43:12 +00:00
Zuul
a600146bb7 Merge "Add relnotes for ODL migration to diagstatus API" 2019-01-03 04:03:15 +00:00
Zuul
02a80d1141 Merge "Remove unused nova packages from host during upgrade and update" 2019-01-03 03:55:03 +00:00
Zuul
0f62b10039 Merge "Run collectd socket cleanup on container start" 2019-01-02 20:11:23 +00:00
Marios Andreou
4d9ad790a0 Replace tripleo scenario004-multinode with scenario004-standalone
More info and tracked by tripleo ci squad at [1]

[1] https://tree.taiga.io/project/tripleo-ci-board/us/534

Change-Id: I5e123a531c26f4e95940dcffc57eeba3a5576f9b
2019-01-02 12:09:43 +00:00
Harald Jensås
2c44fe081b L3 routed networks - network.j2 (2/3)
Add parameters for the subnets of each network in network_data
yaml. Associates the base subnet of each network with the first
segment of the network. (All networks have an implicit first
network segment when they are created.)

Additional segments and subnets defined in the ``subnets`` key
of each composable network is created with subnet to segment
association.

Partial: blueprint tripleo-routed-networks-templates
Change-Id: I53559ed1445f66fa50508ac9898cbec07914b3fc
2018-12-30 19:25:46 +01:00
Harald Jensås
91985cfbce L3 routed networks - data + env (1/3)
Render composable network L3 routed subnets in
network-environment yaml files.

Partial: blueprint tripleo-routed-networks-templates
Change-Id: I4ba234ede5b7f243ba41e8fec8f78e1f1cc261c8
2018-12-30 19:24:29 +01:00
Zuul
18d77c1704 Merge "Use mtu of Tenant network to control neutron global_physnet_mtu" 2018-12-30 18:03:01 +00:00
Zuul
98f869e340 Merge "Add MTU to neutron networks and nic-config templates" 2018-12-30 16:29:16 +00:00
Tobias Urdin
105ae9db35 Add keystone::wsgi::apache::api_port
This will be the parameter controlling the ports
for the Keystone WSGI vhost in Apache when this [1]
rework is done.

This is to make sure Keystone is still deployed
with both ports in TripleO until it's moved over.

[1] https://review.openstack.org/#/c/619257/

Change-Id: I1c69b27adf450489290a9f8b64f533de1cb28d8b
2018-12-30 01:56:40 +01:00
Zuul
0b5de70375 Merge "flatten snmp service configuration" 2018-12-30 00:34:39 +00:00
Victoria Martinez de la Cruz
cd86676615 Update auth parameters
Some parameters have been deprecated in puppet-manila
Whereas we are picking up deprecated parameters, it's good
that we fix this already here as well.

Change-Id: I29df069bd90eacdd01c9c600cfaebce22fe15731
Depends-On: I745a170ac4458a3f13efc255fc37540a11b54274
Partial-Bug: #1802393
2018-12-26 21:56:16 -03:00
Zuul
473ec7fbf8 Merge "Add python interpreter to ansible postconfig" 2018-12-24 01:09:22 +00:00
Harald Jensås
bbfce240fc Use mtu of Tenant network to control neutron global_physnet_mtu
Change: I11e38f82eb9040f77412fe8ad200fcc48031e2f8 introduced mtu
property for composable networks. This change set the MTU of the
Tenant network as the global_physnet_mtu for neutron, unless the
NeutronGlobalPhysnetMtu is overridden. The default MTU used if
no MTU is defined for the Tenant network is 1500. (The same
default was previously used for the NeutronGlobalPhysnetMtu
parameter.)

Change-Id: I5e60d52ad571e1cdb3b82cd1d9947e33fa682bf8
2018-12-22 17:06:45 +01:00
Harald Jensås
88ab644bdf Use calculated undercloud ctlplane DHCP allocation pools
Change: I4ba148f465b4c452bd5b2c31009ac8a2897bcd5f makes
dhcp_start and dhcp_end optional for non-local subnet
definitions in undercloud.conf.

Start using the AllocationPools parameter istead of the
legacy DhcpStart | DhcpEnd parameters.

Closes-Bug: #1806512
Closes-Bug: #1807707
Depends-On: I4ba148f465b4c452bd5b2c31009ac8a2897bcd5f
Change-Id: Ifdf3e9d22766c1b5ede151979b93754a3d244cc3
2018-12-22 16:06:04 +00:00
Harald Jensås
e644e3dda9 Add MTU to neutron networks and nic-config templates
Neutron has support[1] to set the guaranteed MTU for
networks and network segments so that this is exposed
to plug-ins. In interest of supporting the use of
plug-ins to configure network devices in the future
this change adds MTU property on neutron networks.

The new (optional) property 'mtu' in the network
defenitions in 'network_data.yaml' is used to control
the MTU settings. By default the mtu is '1500'.

We already configure the MTU on the ctlplane neutron
networks, this adds the MTU to composable networks.

Also update the nic-config sample templates to include
mtu settings. A heat value resource is added to
nic-config templates to get the required minimum
viable MTU value for bridges, bonds and member
interfaces to ensure the MTU is large enough to allow
the largest configured MTU to traverse the path.

Closes-Bug: #1790537
Change-Id: I11e38f82eb9040f77412fe8ad200fcc48031e2f8
2018-12-22 17:03:09 +01:00
Cédric Jeanneret
62b4dedb71 The monitoring_subscription was lost in translation
Change-Id: I7a963ddde4befcc52460b3ebcf520fc2065f342a
2018-12-21 23:42:51 +00:00
Zuul
81f408a14d Merge "Temporary remove selinux label mount option for neutron" 2018-12-21 16:17:26 +00:00
Zuul
0638c62e2f Merge "Remove redis from standalone env" 2018-12-21 16:11:19 +00:00
Zuul
1c8bb23a99 Merge "Remove unused params in jinja rendered network config templates" 2018-12-21 15:41:45 +00:00
Giulio Fidente
d8b2e9b3e2 Replace scenario004 multinode with standalone
Following addition of [1], replace use of multinode with
standalone job for scenario004

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

Change-Id: Iff1e83dd227fc2e03924f41592f82a555053425d
2018-12-21 14:46:38 +00:00
Zuul
fb369eb57f Merge "Replace scenario001-multinode with scenario001-standalone" 2018-12-21 14:41:20 +00:00