openstack
/
tripleo-image-elements
Code Issues Proposed changes

remove os-cloud-config element 

It's not being used anymore.

Change-Id: I429c0013802af3bcb80f9a623b8fce0a2e52bb64
This commit is contained in:
Juan Antonio Osorio Robles 2018-04-20 09:37:46 +03:00
parent 950a63f77c
commit 08096ad00f
12 changed files with 4 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/os-cloud-config/README.md
View File

@ -1,4 +0,0 @@
Install os-cloud-config
=======================
os-cloud-config contains useful utilities such as init-keystone, register-nodes

5
elements/os-cloud-config/cleanup.d/50-remove-source-os-cloud-config
View File

@ -1,5 +0,0 @@
#!/bin/bash
set -eu
sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/os-cloud-config"

3
elements/os-cloud-config/element-deps
View File

@ -1,3 +0,0 @@
pip-and-virtualenv
pip-manifest
source-repositories

5
elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash
View File

@ -1,5 +0,0 @@
#!/bin/bash
if [ -z "${OS_CLOUD_CONFIG_VENV_DIR:-}" ]; then
export OS_CLOUD_CONFIG_VENV_DIR="${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/os-cloud-config"}"
fi

31
elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config
View File

@ -1,31 +0,0 @@
#!/bin/bash
set -eux
set -o pipefail
manifest=$(get-pip-manifest os-cloud-config)
virtualenv --setuptools ${OS_CLOUD_CONFIG_VENV_DIR}
set +u
source ${OS_CLOUD_CONFIG_VENV_DIR}/bin/activate
set -u
if [ -n "$manifest" ]; then
use-pip-manifest $manifest
else
# bug #1201253 : virtualenv-1.10.1 embeds setuptools-0.9.8, which
# doesn't manage correctly HTTPS sockets when downloading pbr from
# https://pypi.python.org/simple/ if using http_proxy and https_proxy
# envvars
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0'
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install \
--install-option="--install-scripts=/usr/local/bin" -U os-cloud-config
fi
# Write the manifest of what was installed
write-pip-manifest os-cloud-config
set +u
deactivate
set -u

1
elements/os-cloud-config/install.d/os-cloud-config-pip-install/91-os-cloud-config-links
View File

@ -1 +0,0 @@
../os-cloud-config-source-install/91-os-cloud-config-links

41
elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config
View File

@ -1,41 +0,0 @@
#!/bin/bash
set -eux
manifest=$(get-pip-manifest os-cloud-config)
virtualenv --setuptools ${OS_CLOUD_CONFIG_VENV_DIR}
set +u
source ${OS_CLOUD_CONFIG_VENV_DIR}/bin/activate
set -u
if [ -n "$manifest" ]; then
use-pip-manifest $manifest
else
# bug #1201253 : virtualenv-1.10.1 embeds setuptools-0.9.8, which
# doesn't manage correctly HTTPS sockets when downloading pbr from
# https://pypi.python.org/simple/ if using http_proxy and https_proxy
# envvars
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0'
if [ -e /opt/stack/os-cloud-config/requirements.txt ]; then
reqs=/opt/stack/os-cloud-config/requirements.txt
elif [ -e /opt/stack/os-cloud-config/tools/pip-requires ]; then
reqs=/opt/stack/os-cloud-config/tools/pip-requires
else
reqs=""
fi
if [ -n "$reqs" ] ; then
pip install -r $reqs
fi
fi
# All reqs are installed, install from source (dev versions are not installed from manifests)
pip install /opt/stack/os-cloud-config
# Write the manifest of what was installed
write-pip-manifest os-cloud-config
set +u
deactivate
set -u

6
elements/os-cloud-config/install.d/os-cloud-config-source-install/91-os-cloud-config-links
View File

@ -1,6 +0,0 @@
#!/bin/bash
set -eux
ln -s ${OS_CLOUD_CONFIG_VENV_DIR}/bin/init-keystone /usr/local/bin/init-keystone
ln -s ${OS_CLOUD_CONFIG_VENV_DIR}/bin/generate-keystone-pki /usr/local/bin/generate-keystone-pki
ln -s ${OS_CLOUD_CONFIG_VENV_DIR}/bin/register-nodes /usr/local/bin/register-nodes

2
elements/os-cloud-config/package-installs.yaml
View File

@ -1,2 +0,0 @@
os-cloud-config:
installtype: package

10
elements/os-cloud-config/pkg-map
View File

@ -1,10 +0,0 @@
{
"family": {
"debian": {
"os-cloud-config": "python-os-cloud-config"
}
},
"default": {
"os-cloud-config": "os-cloud-config"
}
}

1
elements/os-cloud-config/source-repository-os-cloud-config
View File

@ -1 +0,0 @@
os-cloud-config git /opt/stack/os-cloud-config https://git.openstack.org/openstack/os-cloud-config

4
releasenotes/notes/Remove-os-cloud-config-element-c9368e4a0dec66e9.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
The os-cloud-config element has been removed.