Remove deployed-server bootstrap resource

Removes the deployed-server bootstrap resource from the deployed-server
template as the equivalent functionality enabled by the scripts has been
moved to the tripleo-bootstrap ansible role provided by tripleo-common.

The environments and templates for the bootstrap resource are deprecated
in train and will be removed in a future release.

Change-Id: If5adc76190e986bae1346a3a7e8dda8a2bc92f27
Depends-On: Idc13a88481ae618f0321009f49acf71e68258b95
implements: blueprint reduce-deployment-resources
This commit is contained in:
James Slagle 2019-05-20 17:35:24 -04:00
parent dee66d8983
commit 198cfb6f8d
9 changed files with 35 additions and 5 deletions

View File

@ -1,3 +1,7 @@
# DEPRECATED. This script is deprecated in train and will be removed in a
# future release. The functionality of the bootstrap scripts has been moved to
# the tripleo-bootstrap ansible role provided by tripleo-common.
#
#!/bin/bash #!/bin/bash
set -eux set -eux

View File

@ -1,3 +1,7 @@
# DEPRECATED. This template is deprecated in train and will be removed in a
# future release. The functionality of the bootstrap scripts has been moved to
# the tripleo-bootstrap ansible role provided by tripleo-common.
#
heat_template_version: rocky heat_template_version: rocky
description: 'Deployed Server Bootstrap Config' description: 'Deployed Server Bootstrap Config'

View File

@ -1,3 +1,7 @@
# DEPRECATED. This script is deprecated in train and will be removed in a
# future release. The functionality of the bootstrap scripts has been moved to
# the tripleo-bootstrap ansible role provided by tripleo-common.
#
#!/bin/bash #!/bin/bash
set -eux set -eux

View File

@ -1,3 +1,7 @@
# DEPRECATED. This template is deprecated in train and will be removed in a
# future release. The functionality of the bootstrap scripts has been moved to
# the tripleo-bootstrap ansible role provided by tripleo-common.
#
heat_template_version: rocky heat_template_version: rocky
description: 'Deployed Server Bootstrap Config' description: 'Deployed Server Bootstrap Config'

View File

@ -69,11 +69,6 @@ resources:
software_config_transport: {get_param: software_config_transport} software_config_transport: {get_param: software_config_transport}
deployment_swift_data: {get_param: deployment_swift_data} deployment_swift_data: {get_param: deployment_swift_data}
DeployedServerBootstrapConfig:
type: OS::TripleO::DeployedServer::Bootstrap
properties:
server: {get_resource: deployed-server}
ControlPlanePort: ControlPlanePort:
type: OS::TripleO::DeployedServer::ControlPlanePort type: OS::TripleO::DeployedServer::ControlPlanePort
properties: properties:

View File

@ -1,3 +1,7 @@
# DEPRECATED. This environment is deprecated in train and will be removed in a
# future release. The functionality of the bootstrap scripts has been moved to
# the tripleo-bootstrap ansible role provided by tripleo-common.
#
# An environment that can be used with the deployed-server.yaml template to do # An environment that can be used with the deployed-server.yaml template to do
# initial bootstrapping of the deployed servers. # initial bootstrapping of the deployed servers.
resource_registry: resource_registry:

View File

@ -1,3 +1,7 @@
# DEPRECATED. This environment is deprecated in train and will be removed in a
# future release. The functionality of the bootstrap scripts has been moved to
# the tripleo-bootstrap ansible role provided by tripleo-common.
#
# An environment that can be used with the deployed-server.yaml template to do # An environment that can be used with the deployed-server.yaml template to do
# initial bootstrapping of the deployed servers. # initial bootstrapping of the deployed servers.
resource_registry: resource_registry:

View File

@ -9,3 +9,6 @@ resource_registry:
{% endfor %} {% endfor %}
OS::TripleO::ControllerDeployedServer::Net::SoftwareConfig: ../net-config-static-bridge.yaml OS::TripleO::ControllerDeployedServer::Net::SoftwareConfig: ../net-config-static-bridge.yaml
parameter_defaults:
EnablePackageInstall: True

View File

@ -0,0 +1,8 @@
---
deprecations:
- |
The environments at
environments/deployed-server-bootstrap-environment-centos.yaml and
environments/deployed-server-bootstrap-environment-rhel.yaml are deprecated
as the functionality they enabled in the bootstrap scripts has been moved
to the tripleo-boostrap ansible role provided by tripleo-common.