Remove PreNetworkConfig resource
PreNetworkConfig resource was required to support host changes before network deployment (for OvS-DPDK). As the required steps has been migrated to ansible deploy_steps with 'step: 0', this resources is no longer required. Change-Id: I11a8ec280b4f5c33b6061a96cb546b4760a45b3a
This commit is contained in:
parent
64a2ee13bc
commit
9305d1efe9
@ -1,23 +0,0 @@
|
||||
## DEPRECATED
|
||||
# KernelArgs and TunedProfileName has been moved from PreNetworkConfig to boot-params-service.yaml (TripleO service)
|
||||
# OvS-DPDK configurations has been moved from PreNetworkConfig to respective dpdk TripleO service (ml2-ovs, ml2-ovn)
|
||||
# host_config_and_reboot.yaml does not do anything, and soon it will be removed
|
||||
|
||||
resource_registry:
|
||||
{% for role in roles %}
|
||||
OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
|
||||
{% endfor %}
|
||||
|
||||
#parameter_defaults:
|
||||
# Note: There are no global parameters which can be applied to all roles as
|
||||
# these configuration have to be specific to role.
|
||||
|
||||
# Sample parameters for Compute and ComputeOvsDpdk roles
|
||||
#ComputeParameters:
|
||||
#KernelArgs: ""
|
||||
#TunedProfileName: ""
|
||||
#IsolCpusList: ""
|
||||
#ComputeOvsDpdkParameters:
|
||||
#KernelArgs: "intel_iommu=on iommu=pt default_hugepagesz=1GB hugepagesz=1G hugepages=60"
|
||||
#TunedProfileName: "cpu-partitioning"
|
||||
#IsolCpusList: ""
|
@ -10,7 +10,6 @@ resource_registry:
|
||||
OS::TripleO::RandomString: OS::Heat::RandomString
|
||||
|
||||
{% for role in roles %}
|
||||
OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
|
||||
OS::TripleO::{{role.name}}PostDeploySteps: common/post.yaml
|
||||
OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}-role.yaml
|
||||
OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
|
||||
|
@ -531,17 +531,8 @@ resources:
|
||||
short:
|
||||
- {get_attr: [{{server_resource_name}}, name]}
|
||||
|
||||
PreNetworkConfig:
|
||||
type: OS::TripleO::{{role.name}}::PreNetworkConfig
|
||||
properties:
|
||||
server: {get_resource: {{server_resource_name}}}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
ServiceNames: {get_param: ServiceNames}
|
||||
deployment_actions: {get_attr: [DeploymentActions, value]}
|
||||
|
||||
# Resource for site-specific injection of root certificate
|
||||
NodeTLSCAData:
|
||||
depends_on: PreNetworkConfig
|
||||
type: OS::TripleO::NodeTLSCAData
|
||||
properties:
|
||||
server: {get_resource: {{server_resource_name}}}
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
deprecations:
|
||||
- |
|
||||
Environment file host-config-and-reboot.yaml has been removed and the
|
||||
required functionality is part of BootParams service.
|
Loading…
Reference in New Issue
Block a user