From 084acebd986a683856330cb8f0d7695cb80cf077 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Wed, 23 Oct 2019 16:21:03 -0400 Subject: [PATCH] Remove previously deprecated deployed-server bootstrap files These files were previously deprecated in 198cfb6f8d6c4384118aee94cd404a8a54432691 and can now be removed. Depends-On: I95f43da44c869f5de2fa4cdaa3d07fcef4ef11b9 Depends-On: I82d7bd1f9b6a7081660b8f4c3d1a41632fd95920 Change-Id: I47ec93105642abe2634850f8f0262e3e6800acc4 (cherry picked from commit 3e36f99f93901ffbe4db53dde0dfa038582b873c) --- .../deployed-server-bootstrap-centos.sh | 38 ------------------- .../deployed-server-bootstrap-centos.yaml | 27 ------------- .../deployed-server-bootstrap-rhel.sh | 35 ----------------- .../deployed-server-bootstrap-rhel.yaml | 27 ------------- ...d-server-bootstrap-environment-centos.yaml | 11 ------ ...yed-server-bootstrap-environment-rhel.yaml | 11 ------ ...yed-server-bootstrap-07590a3cf4688cc9.yaml | 11 ++++++ 7 files changed, 11 insertions(+), 149 deletions(-) delete mode 100755 deployed-server/deployed-server-bootstrap-centos.sh delete mode 100644 deployed-server/deployed-server-bootstrap-centos.yaml delete mode 100755 deployed-server/deployed-server-bootstrap-rhel.sh delete mode 100644 deployed-server/deployed-server-bootstrap-rhel.yaml delete mode 100644 environments/deployed-server-bootstrap-environment-centos.yaml delete mode 100644 environments/deployed-server-bootstrap-environment-rhel.yaml create mode 100644 releasenotes/notes/remove-deprecated-deployed-server-bootstrap-07590a3cf4688cc9.yaml diff --git a/deployed-server/deployed-server-bootstrap-centos.sh b/deployed-server/deployed-server-bootstrap-centos.sh deleted file mode 100755 index 77bfff43fd..0000000000 --- a/deployed-server/deployed-server-bootstrap-centos.sh +++ /dev/null @@ -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 diff --git a/deployed-server/deployed-server-bootstrap-centos.yaml b/deployed-server/deployed-server-bootstrap-centos.yaml deleted file mode 100644 index 71b359cb8a..0000000000 --- a/deployed-server/deployed-server-bootstrap-centos.yaml +++ /dev/null @@ -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} diff --git a/deployed-server/deployed-server-bootstrap-rhel.sh b/deployed-server/deployed-server-bootstrap-rhel.sh deleted file mode 100755 index ff6d099c50..0000000000 --- a/deployed-server/deployed-server-bootstrap-rhel.sh +++ /dev/null @@ -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 diff --git a/deployed-server/deployed-server-bootstrap-rhel.yaml b/deployed-server/deployed-server-bootstrap-rhel.yaml deleted file mode 100644 index 8104edd679..0000000000 --- a/deployed-server/deployed-server-bootstrap-rhel.yaml +++ /dev/null @@ -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} diff --git a/environments/deployed-server-bootstrap-environment-centos.yaml b/environments/deployed-server-bootstrap-environment-centos.yaml deleted file mode 100644 index b31feb0a97..0000000000 --- a/environments/deployed-server-bootstrap-environment-centos.yaml +++ /dev/null @@ -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 diff --git a/environments/deployed-server-bootstrap-environment-rhel.yaml b/environments/deployed-server-bootstrap-environment-rhel.yaml deleted file mode 100644 index 7097d20dca..0000000000 --- a/environments/deployed-server-bootstrap-environment-rhel.yaml +++ /dev/null @@ -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 diff --git a/releasenotes/notes/remove-deprecated-deployed-server-bootstrap-07590a3cf4688cc9.yaml b/releasenotes/notes/remove-deprecated-deployed-server-bootstrap-07590a3cf4688cc9.yaml new file mode 100644 index 0000000000..73493f21d5 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-deployed-server-bootstrap-07590a3cf4688cc9.yaml @@ -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