Remove previously deprecated deployed-server bootstrap files
These files were previously deprecated in198cfb6f8dand can now be removed. Depends-On: I95f43da44c869f5de2fa4cdaa3d07fcef4ef11b9 Depends-On: I82d7bd1f9b6a7081660b8f4c3d1a41632fd95920 Change-Id: I47ec93105642abe2634850f8f0262e3e6800acc4 (cherry picked from commit3e36f99f93)
This commit is contained in:
James Slagle
parent
813f68b53b
commit
084acebd98
|
|
@ -1,38 +0,0 @@
|
|||
# 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
|
||||
|
||||
yum install -y \
|
||||
jq \
|
||||
python-ipaddress \
|
||||
puppet-tripleo \
|
||||
os-net-config \
|
||||
openvswitch \
|
||||
python-heat-agent* \
|
||||
openstack-selinux
|
||||
|
||||
ln -s -f /usr/share/openstack-puppet/modules/* /etc/puppet/modules
|
||||
|
||||
setenforce 0
|
||||
sed -i 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config
|
||||
|
||||
echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/iptables
|
||||
echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/ip6tables
|
||||
|
||||
if [ ! -f /usr/bin/ansible-playbook ]; then
|
||||
if [ -f /usr/bin/ansible-playbook-3 ]; then
|
||||
ln -s -f /usr/bin/ansible-playbook-3 /usr/local/bin/ansible-playbook
|
||||
fi
|
||||
else
|
||||
if [ ! -f /usr/bin/ansible-playbook-3 ]; then
|
||||
ln -s -f /usr/bin/ansible-playbook /usr/local/bin/ansible-playbook-3
|
||||
fi
|
||||
fi
|
||||
|
||||
# https://launchpad.net/bugs/1823353
|
||||
systemctl enable network
|
||||
systemctl start network
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# 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'
|
||||
|
||||
parameters:
|
||||
|
||||
server:
|
||||
type: string
|
||||
|
||||
resources:
|
||||
|
||||
DeployedServerBootstrapConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: script
|
||||
config: {get_file: deployed-server-bootstrap-centos.sh}
|
||||
|
||||
DeployedServerBootstrapDeployment:
|
||||
type: OS::Heat::SoftwareDeployment
|
||||
properties:
|
||||
name: DeployedServerBootstrapDeployment
|
||||
config: {get_resource: DeployedServerBootstrapConfig}
|
||||
server: {get_param: server}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# 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
|
||||
|
||||
yum install -y \
|
||||
jq \
|
||||
puppet-tripleo\
|
||||
os-net-config \
|
||||
openvswitch \
|
||||
python3-heat-agent* \
|
||||
lvm2 \
|
||||
openstack-selinux
|
||||
|
||||
ln -s -f /usr/share/openstack-puppet/modules/* /etc/puppet/modules
|
||||
|
||||
echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/iptables
|
||||
echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/ip6tables
|
||||
|
||||
if [ ! -f /usr/bin/ansible-playbook ]; then
|
||||
if [ -f /usr/bin/ansible-playbook-3 ]; then
|
||||
ln -s -f /usr/bin/ansible-playbook-3 /usr/local/bin/ansible-playbook
|
||||
fi
|
||||
else
|
||||
if [ ! -f /usr/bin/ansible-playbook-3 ]; then
|
||||
ln -s -f /usr/bin/ansible-playbook /usr/local/bin/ansible-playbook-3
|
||||
fi
|
||||
fi
|
||||
|
||||
# https://launchpad.net/bugs/1823353
|
||||
systemctl enable network
|
||||
systemctl start network
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# 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'
|
||||
|
||||
parameters:
|
||||
|
||||
server:
|
||||
type: string
|
||||
|
||||
resources:
|
||||
|
||||
DeployedServerBootstrapConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: script
|
||||
config: {get_file: deployed-server-bootstrap-rhel.sh}
|
||||
|
||||
DeployedServerBootstrapDeployment:
|
||||
type: OS::Heat::SoftwareDeployment
|
||||
properties:
|
||||
name: DeployedServerBootstrapDeployment
|
||||
config: {get_resource: DeployedServerBootstrapConfig}
|
||||
server: {get_param: server}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# 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:
|
||||
OS::TripleO::DeployedServer::Bootstrap: ../deployed-server/deployed-server-bootstrap-centos.yaml
|
||||
|
||||
parameter_defaults:
|
||||
EnablePackageInstall: True
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# 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:
|
||||
OS::TripleO::DeployedServer::Bootstrap: ../deployed-server/deployed-server-bootstrap-rhel.yaml
|
||||
|
||||
parameter_defaults:
|
||||
EnablePackageInstall: True
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
The deployed-server bootstrap environments, templates, and scripts that
|
||||
were previously deprecated are now removed. These removals include
|
||||
deployed-server/deployed-server-bootstrap-centos.sh
|
||||
deployed-server/deployed-server-bootstrap-centos.yaml
|
||||
deployed-server/deployed-server-bootstrap-rhel.sh
|
||||
deployed-server/deployed-server-bootstrap-rhel.yaml
|
||||
environments/deployed-server-bootstrap-environment-centos.yaml
|
||||
environments/deployed-server-bootstrap-environment-rhel.yaml
|
||||
Loading…
Reference in New Issue