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
changes/21/660221/10
James Slagle 3 years ago
parent dee66d8983
commit 198cfb6f8d
  1. 4
      deployed-server/deployed-server-bootstrap-centos.sh
  2. 4
      deployed-server/deployed-server-bootstrap-centos.yaml
  3. 4
      deployed-server/deployed-server-bootstrap-rhel.sh
  4. 4
      deployed-server/deployed-server-bootstrap-rhel.yaml
  5. 5
      deployed-server/deployed-server.yaml
  6. 4
      environments/deployed-server-bootstrap-environment-centos.yaml
  7. 4
      environments/deployed-server-bootstrap-environment-rhel.yaml
  8. 3
      environments/deployed-server-environment.j2.yaml
  9. 8
      releasenotes/notes/remove-deployed-server-bootstrap-resource-7de0596b90f1b15a.yaml

@ -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
set -eux

@ -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
description: 'Deployed Server Bootstrap Config'

@ -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
set -eux

@ -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
description: 'Deployed Server Bootstrap Config'

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

@ -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
# initial bootstrapping of the deployed servers.
resource_registry:

@ -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
# initial bootstrapping of the deployed servers.
resource_registry:

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

@ -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.
Loading…
Cancel
Save