diff --git a/deployed-server/deployed-server-bootstrap-centos.sh b/deployed-server/deployed-server-bootstrap-centos.sh index ed9c00a117..77bfff43fd 100755 --- a/deployed-server/deployed-server-bootstrap-centos.sh +++ b/deployed-server/deployed-server-bootstrap-centos.sh @@ -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 diff --git a/deployed-server/deployed-server-bootstrap-centos.yaml b/deployed-server/deployed-server-bootstrap-centos.yaml index f68e3f9260..71b359cb8a 100644 --- a/deployed-server/deployed-server-bootstrap-centos.yaml +++ b/deployed-server/deployed-server-bootstrap-centos.yaml @@ -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' diff --git a/deployed-server/deployed-server-bootstrap-rhel.sh b/deployed-server/deployed-server-bootstrap-rhel.sh index dbe7f53366..ff6d099c50 100755 --- a/deployed-server/deployed-server-bootstrap-rhel.sh +++ b/deployed-server/deployed-server-bootstrap-rhel.sh @@ -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 diff --git a/deployed-server/deployed-server-bootstrap-rhel.yaml b/deployed-server/deployed-server-bootstrap-rhel.yaml index 6b10951e08..8104edd679 100644 --- a/deployed-server/deployed-server-bootstrap-rhel.yaml +++ b/deployed-server/deployed-server-bootstrap-rhel.yaml @@ -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' diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index ab55c642b2..2a918412bd 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -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: diff --git a/environments/deployed-server-bootstrap-environment-centos.yaml b/environments/deployed-server-bootstrap-environment-centos.yaml index ebcdfc2b93..b31feb0a97 100644 --- a/environments/deployed-server-bootstrap-environment-centos.yaml +++ b/environments/deployed-server-bootstrap-environment-centos.yaml @@ -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: diff --git a/environments/deployed-server-bootstrap-environment-rhel.yaml b/environments/deployed-server-bootstrap-environment-rhel.yaml index f614a91ab7..7097d20dca 100644 --- a/environments/deployed-server-bootstrap-environment-rhel.yaml +++ b/environments/deployed-server-bootstrap-environment-rhel.yaml @@ -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: diff --git a/environments/deployed-server-environment.j2.yaml b/environments/deployed-server-environment.j2.yaml index 327934da3b..76d66939f1 100644 --- a/environments/deployed-server-environment.j2.yaml +++ b/environments/deployed-server-environment.j2.yaml @@ -9,3 +9,6 @@ resource_registry: {% endfor %} OS::TripleO::ControllerDeployedServer::Net::SoftwareConfig: ../net-config-static-bridge.yaml + +parameter_defaults: + EnablePackageInstall: True diff --git a/releasenotes/notes/remove-deployed-server-bootstrap-resource-7de0596b90f1b15a.yaml b/releasenotes/notes/remove-deployed-server-bootstrap-resource-7de0596b90f1b15a.yaml new file mode 100644 index 0000000000..40a26bcd74 --- /dev/null +++ b/releasenotes/notes/remove-deployed-server-bootstrap-resource-7de0596b90f1b15a.yaml @@ -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.