Browse Source

Merge "Remove previously deprecated deployed-server bootstrap files" into stable/train

changes/20/704220/1
Zuul Gerrit Code Review 1 month ago
parent
commit
2ccc8c6f77
7 changed files with 11 additions and 149 deletions
  1. +0
    -38
      deployed-server/deployed-server-bootstrap-centos.sh
  2. +0
    -27
      deployed-server/deployed-server-bootstrap-centos.yaml
  3. +0
    -35
      deployed-server/deployed-server-bootstrap-rhel.sh
  4. +0
    -27
      deployed-server/deployed-server-bootstrap-rhel.yaml
  5. +0
    -11
      environments/deployed-server-bootstrap-environment-centos.yaml
  6. +0
    -11
      environments/deployed-server-bootstrap-environment-rhel.yaml
  7. +11
    -0
      releasenotes/notes/remove-deprecated-deployed-server-bootstrap-07590a3cf4688cc9.yaml

+ 0
- 38
deployed-server/deployed-server-bootstrap-centos.sh View File

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

+ 0
- 27
deployed-server/deployed-server-bootstrap-centos.yaml View File

@@ -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}

+ 0
- 35
deployed-server/deployed-server-bootstrap-rhel.sh View File

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

+ 0
- 27
deployed-server/deployed-server-bootstrap-rhel.yaml View File

@@ -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}

+ 0
- 11
environments/deployed-server-bootstrap-environment-centos.yaml View File

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

+ 0
- 11
environments/deployed-server-bootstrap-environment-rhel.yaml View File

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

+ 11
- 0
releasenotes/notes/remove-deprecated-deployed-server-bootstrap-07590a3cf4688cc9.yaml View File

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