diff --git a/elements/os-cloud-config/README.md b/elements/os-cloud-config/README.md deleted file mode 100644 index 2806f6d59..000000000 --- a/elements/os-cloud-config/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Install os-cloud-config -======================= - -os-cloud-config contains useful utilities such as init-keystone, register-nodes diff --git a/elements/os-cloud-config/cleanup.d/50-remove-source-os-cloud-config b/elements/os-cloud-config/cleanup.d/50-remove-source-os-cloud-config deleted file mode 100755 index 357f75155..000000000 --- a/elements/os-cloud-config/cleanup.d/50-remove-source-os-cloud-config +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/os-cloud-config" diff --git a/elements/os-cloud-config/element-deps b/elements/os-cloud-config/element-deps deleted file mode 100644 index 6e2fcb089..000000000 --- a/elements/os-cloud-config/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -pip-and-virtualenv -pip-manifest -source-repositories diff --git a/elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash b/elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash deleted file mode 100644 index 4800f5b4f..000000000 --- a/elements/os-cloud-config/environment.d/10-os-cloud-config-install-options.bash +++ /dev/null @@ -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 diff --git a/elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config b/elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config deleted file mode 100755 index f9155c41a..000000000 --- a/elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config +++ /dev/null @@ -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 diff --git a/elements/os-cloud-config/install.d/os-cloud-config-pip-install/91-os-cloud-config-links b/elements/os-cloud-config/install.d/os-cloud-config-pip-install/91-os-cloud-config-links deleted file mode 120000 index d731be2c0..000000000 --- a/elements/os-cloud-config/install.d/os-cloud-config-pip-install/91-os-cloud-config-links +++ /dev/null @@ -1 +0,0 @@ -../os-cloud-config-source-install/91-os-cloud-config-links \ No newline at end of file diff --git a/elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config b/elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config deleted file mode 100755 index eddeca708..000000000 --- a/elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config +++ /dev/null @@ -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 diff --git a/elements/os-cloud-config/install.d/os-cloud-config-source-install/91-os-cloud-config-links b/elements/os-cloud-config/install.d/os-cloud-config-source-install/91-os-cloud-config-links deleted file mode 100755 index 9a6b431e8..000000000 --- a/elements/os-cloud-config/install.d/os-cloud-config-source-install/91-os-cloud-config-links +++ /dev/null @@ -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 diff --git a/elements/os-cloud-config/package-installs.yaml b/elements/os-cloud-config/package-installs.yaml deleted file mode 100644 index e21fe2c83..000000000 --- a/elements/os-cloud-config/package-installs.yaml +++ /dev/null @@ -1,2 +0,0 @@ -os-cloud-config: - installtype: package diff --git a/elements/os-cloud-config/pkg-map b/elements/os-cloud-config/pkg-map deleted file mode 100644 index 1902411e1..000000000 --- a/elements/os-cloud-config/pkg-map +++ /dev/null @@ -1,10 +0,0 @@ -{ - "family": { - "debian": { - "os-cloud-config": "python-os-cloud-config" - } - }, - "default": { - "os-cloud-config": "os-cloud-config" - } -} diff --git a/elements/os-cloud-config/source-repository-os-cloud-config b/elements/os-cloud-config/source-repository-os-cloud-config deleted file mode 100644 index 9d1670263..000000000 --- a/elements/os-cloud-config/source-repository-os-cloud-config +++ /dev/null @@ -1 +0,0 @@ -os-cloud-config git /opt/stack/os-cloud-config https://git.openstack.org/openstack/os-cloud-config diff --git a/releasenotes/notes/Remove-os-cloud-config-element-c9368e4a0dec66e9.yaml b/releasenotes/notes/Remove-os-cloud-config-element-c9368e4a0dec66e9.yaml new file mode 100644 index 000000000..a198d6a41 --- /dev/null +++ b/releasenotes/notes/Remove-os-cloud-config-element-c9368e4a0dec66e9.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + The os-cloud-config element has been removed.