Commit Graph

544 Commits (1caa1024e74a2f8d4e92e96c94ffca9072e45814)

Author SHA1 Message Date
Alex Schultz 0c167aedea Remove zaqar
Zaqar was deprecated in Wallaby and is no longer in use on the
undercloud and it hasn't been officially supported in the
overcloud for some time.

Change-Id: I3bdcc72d6127ec96ff2307cafbf57f6178c3ef5c
2021-09-16 15:12:29 -06:00
Alex Schultz cb630d03be Remove mistral
Mistral was deprecated in Wallaby and is no longer in use on the
undercloud and it hasn't been officially supported in the overcloud for
some time.

Change-Id: I6963453f53cb554ca8fdb58706f04838bbd11ba0
2021-09-16 15:12:18 -06:00
Takashi Kajinami 06cc21a445 Manila: Drop tenant_id templating from v2 endpoint
Manila's wallaby release [1] made it possible for the v2 endpoint to
not include a tenant_id (project_id). This change was made to
accommodate interactions by system scoped users.

System scoped users cannot interact with an endpoint that needs
the "tenant_id" templating, because system scoped tokens cannot be
resolved to a particular tenant_id by definition. More information
regarding this change is captured in the release notes for
the project [2] and the API reference [3].


Co-Authored-By: Goutham Pacha Ravi <>
Change-Id: I85aec373e86ab587ead389852730bcf833311ae4
2021-08-18 14:25:33 +00:00
Martin Schuppert ad1ba1bc39 Add comment for libvirt/vnc network sync
In I08fa1ee947574e6fac24885b17706a22054fcba9 we added sync of
NovaLibvirtNetwork and NovaVncProxyNetwork. This just adds a
comment for this.

Change-Id: If8c74d5c00fb6b31de98917b984a376fc192ff53
2021-06-30 12:32:32 +02:00
Martin Schuppert 9da8a40595 Remove NovaVncProxyNetwork from ServiceNetMap
In Icef2481b65b41b524ad44eeecfbee4451006e1d2 we moved to use
NovaLibvirtNetwork as the single network to configure instance console
Due to how hieradata is being rendered via tripleo-hieradata, the
removed NovaVncProxyNetwork resulted in no-vnc-proxy service to
fall back to the control plane network because NovaVncProxyNetwork
was removed.
NovaVncProxyNetwork was then reintroduced with
I595294956a4a7a0e2280c685ac1d2543edbc32f2 but as a side effect
again introduced the inconsistency on the console configuration.

This patch removes the NovaVncProxyNetwork from ServiceNetMap
but set it as part of service_net_map.j2.yaml and keep it in
sync with NovaLibvirtNetwork.

Change-Id: I08fa1ee947574e6fac24885b17706a22054fcba9
Closes-Bug: #1917719
2021-06-28 15:06:58 +02:00
ramishra a263da138f Use merge strategy for EndpointMap
Now someone can override individual endpoints like
below in an environment:

  EndpointMap: merge

      protocol: http
      port: 9999

Closes-Bug: #1897592
Change-Id: Ibf2e0d183dd51421c4feb7467c3c01fb416d2965
2021-06-15 09:15:41 +05:30
Harald Jensås ed8bdde212 Set default for network.ip_subnet
Jinja2 rendering failed when using network-v2 format
because the network_data yaml does not include the
ip_subnet key at the network level.

Default network.ip_subnet to "" in the places were it
does not have a the default already.

These templates are not used with network-v2.

Closes-Bug: #1929835
Change-Id: Ib4d0551d99afd55fbb513f8c5050fb835dc332b4
2021-06-03 19:41:02 +02:00
Oliver Walsh 181505145e Fix network_cidrs when ManageNetworks: false
The legacy parameters (e.g InternalApiNetCidr) default to the new
network_data.yaml values.

When ManageNetworks: true the value of these parameters is then used to
create the network resources. The cidr attribute of the resources are
then used to build the network_cidrs output value resulting in the
correct list of cidrs.

However when Managenetworks: false the resources are not created so an
alternative approach is required. Currently only the values from
network_data.yaml are used. If the legacy parameters are being used in
a deployment this will result in the cidrs from the default
t-h-t/network_data.yaml instead of the values from the heat parameters.

This can result in live migration failure as the firewall subnet is
incorrect on compute nodes.

To resolve this we can just use the value from the legacy params to
build the cidr list when ManageNetworks: false. There is also an
unnecessary list_concat which can be removed.

Closes-bug: 1929470
Change-Id: Ibe5f9ec4dc32a6e8277e95032e608209a035cad5
2021-05-24 23:22:29 +01:00
Zuul ff5c2c91d3 Merge "Use server side env merging for ServiceNetMap/VipSubnetMap" 2021-05-21 05:48:23 +00:00
Zuul 11f0408573 Merge "Add neutron port tag hint for role name" 2021-05-21 04:59:26 +00:00
ramishra b253d564f7 Use server side env merging for ServiceNetMap/VipSubnetMap
This simplifies the ServiceNetMap/VipSubnetMap interfaces
to use parameter merge strategy and removes the *Defaults

Change-Id: Ic73628a596e9051b5c02435b712643f9ef7425e3
2021-05-19 10:16:58 +05:30
Martin Schuppert 36648cf7f0 Re-add NovaVncProxyNetwork to service_net_map.j2.yaml
Icef2481b65b41b524ad44eeecfbee4451006e1d2 removed the NovaVncProxyNetwork
from network/service_net_map.j2.yaml, but due to how hieradata is
being rendered via tripleo-hieradata, the hieradata for the no-vnc-proxy
service falls back to the control plane network.

Change-Id: I595294956a4a7a0e2280c685ac1d2543edbc32f2
2021-05-17 15:43:24 +02:00
Harald Jensås 659cc55277 Add neutron port tag hint for role name
Adds a tag tripleo_role=$ROLE to neutron ports
created by heat.

Related: blueprint network-data-v2-ports
Change-Id: I238572444e2931546d44864b2de497dd2825c2dc
2021-05-14 21:31:50 +02:00
Zuul aac7daa026 Merge "Fix jinja2 for VipSubnetMapDefaults redis and ovs_dbs" 2021-04-28 01:20:35 +00:00
Zuul 45d508bf99 Merge "Allow access to RabbitMQ management plugin over network" 2021-04-23 22:21:31 +00:00
James Slagle 9d9f0ed744 Add DefaultRoute to deployed_port.j2
Commit cea78ad4fd added DefaultRoute as a
property of the port resources, but it was missed adding it as a
parameter of deployed_port.j2.

Change-Id: I8235220cc0d1d699ac2abf993d6c49494613bdac
Signed-off-by: James Slagle <>
2021-04-22 17:50:02 -04:00
Takashi Kajinami 31674339d8 Allow access to RabbitMQ management plugin over network
This change introduces the new RabbitmqEnableManagementAccess parameter
so that operators can expose management plugin to specific network to
monitor status over network.

Change-Id: I09c62af87481e131c26c9d5f9faa16be349347b0
2021-04-17 00:04:16 +09:00
Zuul 820c6e884e Merge "Add DefaultRoute parameter to ports/noop.yaml" 2021-04-15 14:43:14 +00:00
Harald Jensås b4b2bc5d70 Add DefaultRoute parameter to ports/noop.yaml
With change I20d48b3a29193dbcb70ec5cb13daf153bb0aeff2
we need to define the DefaultRoute parameter in the
noop.yaml port template.

Change-Id: I0df6116e41e5c9932ec5876dbde409f6fdd5de13
2021-04-14 18:13:53 +02:00
Harald Jensås 80b226c44c Fix "ManageNetworks" use-case
With change I603521bd00dc100e03c765c25503b5e01f3383e4
the ManageNetworks == False use case was overlooked.

When ManageNetworks is set to False and networks are
not created we need to build network_attrs and
subnet_attrs from the data present in network_data.yaml
and parameters.

Closes-Bug: #1920050
Change-Id: I98a3d582add0d6881cd39433ddb25515f0e0dc31
2021-04-14 15:23:32 +02:00
Harald Jensås 70dc61cc0a Add tripleo_network_name tag hint to networks
The ansible module to manage networks sets the name
upper as a tag hint on the neutron network resources.

This change adds this tag for Heat managed networks as

Change-Id: I717b06a0578dccca0e2152f6d454ad7a96cff8fb
Partial-Implements: blueprint network-data-v2-ports
2021-04-12 12:45:09 +00:00
Harald Jensås 73684d0a89 Set tags on all OS::Neutron::Port resources
Set up tag hints on all OS::Neutron::Port resources.
The network-data-v2 work uses tags on neutron resources
to find existing resources so that we update instead
of create. Also for generating environment files info
in the neutron tag field is utilized.

Partial-Implements: blueprint network-data-v2-ports
Change-Id: I3d43ae22cc45e5528ecfb1a6b2cb8602faa162a0
2021-04-12 12:49:41 +02:00
Zuul bdd379cfdd Merge "Add neutron port tag hint for default_route_network" 2021-04-09 10:30:02 +00:00
Zuul c73c470be7 Merge "Remove tripleo_hostname tag" 2021-04-09 01:40:04 +00:00
ramishra c9991c2e31 Use 'wallaby' heat_template_version
With I57047682cfa82ba6ca4affff54fab5216e9ba51c Heat has added
a new template version for wallaby. This would allow us to use
2-argument variant of the ``if`` function that would allow for
 e.g. conditional definition of resource properties and help
cleanup templates. If only two arguments are passed to ``if``
function, the entire enclosing item is removed when the condition
is false.

Change-Id: I25f981b60c6a66b39919adc38c02a051b6c51269
2021-03-31 17:35:12 +05:30
Harald Jensås cea78ad4fd Add neutron port tag hint for default_route_network
Adds a tag tripleo_default_route=$BOOL to neutron ports
created by heat indicating if the ports interface is
used for the default route.

The value is controlled by the 'default_route_networks'
in roles data.

With network-data-v2 the same tag will be used to
set up ansible vars appropriately. Having the heat driven
process add the tag can be useful for upgrade/migration

Related: blueprint network-data-v2-ports
Change-Id: I20d48b3a29193dbcb70ec5cb13daf153bb0aeff2
2021-03-30 13:14:13 +02:00
Harald Jensås b40d5d7027 Remove tripleo_hostname tag
The tags field in neutron has a max length of
60 characters. A hostname can be longer, and in
the case it is longer adding the tag will cause
a "Invalid input exceeds maximum length of 60"
error will be raised.

Related-Bug: #1921713
Change-Id: I72fd4a9575482389900145a03a6142cccd1111ba
2021-03-30 12:42:52 +02:00
Zuul 86e13bbf36 Merge "Add the Unbound DNS resolver service" 2021-03-20 01:44:00 +00:00
Michael Johnson 773fccb7c1 Add the Unbound DNS resolver service
This patch addes TripleO support for the Unbound DNS resolver service.
This service will initially be used by the Designate service.

Change-Id: I8135ce4f344aeb7c0cf7521e0ba42335c4c7bbc8
2021-03-18 17:12:35 +00:00
Zuul 7d28616578 Merge "Use single NovaLibvirtNetwork to configure instance console components" 2021-03-17 10:45:21 +00:00
Martin Schuppert dadf71fcae Use single NovaLibvirtNetwork to configure instance console components
Nova vnc configuration right now uses NovaVncProxyNetwork,
NovaLibvirtNetwork and NovaApiNetwork to configure the different
components (novnc proxy, nova-compute and libvirt) for vnc.
If one of the networks get changed from internal_api, the service
configuration between libvirt, nova-compute and novnc proxy gets
inconsistent and the console is broken.
This changed to just use NovaLibvirtNetwork for configuring the vnc
endpoints and removes NovaVncProxyNetwork completely.

Change-Id: Icef2481b65b41b524ad44eeecfbee4451006e1d2
Closes-Bug: #1917719
2021-03-15 09:01:44 +01:00
Harald Jensås d498ebe872 Add deployed_vip_port templates
Add a new deployed_vip_port template which will replace
the current neutron port templates when vip ports are
managed outside of the heat stack.

Change-Id: Ia1f7e344ccebb2291f1574fdb69c05f00f4c3dc9
Partial-Implements: blueprint network-data-v2-ports
2021-03-10 01:30:25 +01:00
Harald Jensås b842a58e2b Fix jinja2 for VipSubnetMapDefaults redis and ovs_dbs
The current jinja2 code results in the same value no matter
what is in _service_nets so it really has no effect. We can
just as well hard-code the values, which is what this change

Change-Id: I2b212bec170cc93c40f81050d11f696275d8b1ea
2021-02-19 11:34:50 +01:00
Harald Jensås 2d0125ed40 Add an index tag on neutron network resources
When using the multiple nic-config templates in THT
and in tripleo-ansible the ordering of networks in
the network_data file matters.

Add a a tag 'tripleo_net_idx' to neutron resources
to keep track of the ordering.

Partial-Implements: blueprint network-data-v2-ports
Change-Id: I0d39ea713ce1201b60f3def69f453792e402eb33
2021-01-28 02:04:57 +01:00
Harald Jensås fc61731b8c Add deployed_port template
Add a new deployed_port template which will replace
the current neutron port templates when ports are
managed outside of the heat stack.

Partial-Implements: blueprint network-data-v2-ports
Change-Id: Ia71b74e80122e6a12d4f88a90ede02d39763914e
2021-01-13 22:23:44 +00:00
Zuul 3ab975c4b7 Merge "Add deleton_policy to network port resources" 2021-01-13 21:04:28 +00:00
Zuul cf9fb8c848 Merge "Use RootStackName parameter instead for consistency" 2021-01-12 06:02:27 +00:00
Rabi Mishra 6d39c90a22 Use RootStackName parameter instead for consistency
We don't need another parameter for the root stack and
also not required to pass it around.

This was added earlier with [1].


Change-Id: I5dee09ab6c15c1887394b0dbda6866e94231f3a5
2020-12-14 12:38:54 +05:30
Zuul 1e40a1c3a4 Merge "Deployed networks template" 2020-12-11 21:36:41 +00:00
Harald Jensås 1e7015081d Pre-fix neutron resource tags with 'tripleo_'
Tag was added to neutron port resources in:

Tag's previously added was pefixed with 'tripleo_'. This
change adds the 'tripleo_' prefix to the tags on neutron
port resources as well.

Partial-Implements: blueprint network-data-v2-ports
Change-Id: I0fa2230ae4f8ff4fdc6fc4b79e7bdcf3bdff342f
2020-11-30 10:27:32 +01:00
Harald Jensås 06a6fffc17 Add deleton_policy to network port resources
In perparation for trainsition from composable network
ports  managed by heat, to composable network ports
managed with other tooling.

The upgrade prepare step need to set ``PortDeletionPolicy``
to 'retain', so that network ports are not deleted when
running converge.

Change-Id: I16281faefdf68fcaee4c51caa47516ea7084418b
Partial-Implements: blueprint network-data-v2-ports
2020-11-27 22:57:55 +01:00
Harald Jensås caa9d7de03 Deployed networks template
Add a template for deployed networks, pre-deployed
network info in DeployedNetworkEnvironment parameter.
Use templates for 'OS::TripleO::Network' in resource

Change-Id: Id42486b513bef74525c1aa7204de979704e06ace
2020-11-19 02:22:56 +01:00
Harald Jensås 28f2a70912 Add hostname and stack_name tags to ports
Set tag's with the stack name and the hostname
on composable network node ports. The tags will
be used by network-data-v2 with port management
handled outside of heat.

Change-Id: I23c600c1754d463028259a7dc2c6e5538c512ca4
2020-11-14 00:39:29 +00:00
Zuul bd94c1b9d7 Merge "Remove old nic config templates" 2020-11-12 21:36:32 +00:00
Zuul 0519978254 Merge "Remove Sahara support" 2020-11-06 03:12:06 +00:00
Rabi Mishra 3c246d15d8 Remove old nic config templates
This removes all in-tree nic config templates as we've migrated
them. Users can still use copy of those (modified/un-modified).

Change-Id: Ie0be19e416058d33dbe758ebb2a06e55c651a7e9
2020-10-27 15:30:21 +05:30
Takashi Kajinami 4a7d56947a Remove Sahara support
Sahara support was deprecated during previous Ussuri cycle[1], so we
can remove it completely now.

[1] f1d9b15c85
Change-Id: Id047221cb912c09984cc3bf864196a26fd36736f
2020-10-19 09:39:36 +09:00
Harald Jensås ff4d1fbb66 Use tags instead of role names
Role names can be customized, yet in THT jinja2 we
have several places where conditions are based on
the role name. By using tag's such as 'storage',
'ceph' and 'ovsdpdk' we the role names become truly

The depends-on change in TripleO common will
dynamically add tag's to role's based on
for backward compatibility during deprecation

Change-Id: I5ab4e4a220294245f95d328391bfffec87781a09
2020-10-15 12:57:40 +05:30
Harald Jensås e9da1a2a71 Check for network in role.networks for resolve and qdr
In the service net map
HostnameResolveNetwor was fixed for roles that don't have
the InternalApi network. This follows up and fixes the
same issue for MetricsQdrNetwork and Ceph roles as well.

Also re-factor the jinja2 to iterate only once over the

Related-Bug: #1874330
Change-Id: Iff0e30a6c52fea75449dbd228dec45f708036f9f
2020-10-12 13:20:33 +02:00
Zuul 77dadb4bf6 Merge "Concatenate host_routes and default route in overcloud.yaml" 2020-10-09 13:09:43 +00:00