diff --git a/elements/contrail-repo/element-deps b/elements/contrail-repo/element-deps index 77ce2602d..d2c42c4bf 100644 --- a/elements/contrail-repo/element-deps +++ b/elements/contrail-repo/element-deps @@ -1,2 +1,2 @@ pip-manifest -rdo-release +delorean-repo diff --git a/elements/fedora-rdo-icehouse-repository/README.md b/elements/fedora-rdo-icehouse-repository/README.md deleted file mode 100644 index 083fe9ea3..000000000 --- a/elements/fedora-rdo-icehouse-repository/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This element is deprecated. The functionality has been migrated to -the rdo-icehouse and rdo-release elements. - diff --git a/elements/fedora-rdo-icehouse-repository/element-deps b/elements/fedora-rdo-icehouse-repository/element-deps deleted file mode 100644 index 1000cc4d8..000000000 --- a/elements/fedora-rdo-icehouse-repository/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -fedora -rdo-icehouse -rdo-release diff --git a/elements/fedora-rdo-icehouse/README.md b/elements/fedora-rdo-icehouse/README.md deleted file mode 100644 index ce85abdcf..000000000 --- a/elements/fedora-rdo-icehouse/README.md +++ /dev/null @@ -1,7 +0,0 @@ -The fedora-rdo-icehouse element produces image builds on Fedora using RDO -packages from OpenStack Icehouse. - -Any elements using an OpenStack project used in conjunction with this element -will have their install type set to package via enable-packages-install element, -and the packages will be installed using the yum repository enabled by the -rdo-icehouse and rdo-release elements. diff --git a/elements/fedora-rdo-icehouse/element-deps b/elements/fedora-rdo-icehouse/element-deps deleted file mode 100644 index b92dc8bbd..000000000 --- a/elements/fedora-rdo-icehouse/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -baremetal -fedora -enable-packages-install -rdo-icehouse -rdo-release diff --git a/elements/rdo-icehouse/README.md b/elements/rdo-icehouse/README.md deleted file mode 100644 index e0a779c59..000000000 --- a/elements/rdo-icehouse/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Set `$RDO_RELEASE` to override the default value of icehouse and use a -different RDO release. This element is used in conjunction with the rdo-release -and enable-packages-install element. diff --git a/elements/rdo-icehouse/element-deps b/elements/rdo-icehouse/element-deps deleted file mode 100644 index 303da886b..000000000 --- a/elements/rdo-icehouse/element-deps +++ /dev/null @@ -1 +0,0 @@ -rdo-release diff --git a/elements/rdo-icehouse/environment.d/02-rdo-release.bash b/elements/rdo-icehouse/environment.d/02-rdo-release.bash deleted file mode 100644 index 82033c2f2..000000000 --- a/elements/rdo-icehouse/environment.d/02-rdo-release.bash +++ /dev/null @@ -1 +0,0 @@ -export RDO_RELEASE=${RDO_RELEASE:-"icehouse"} diff --git a/elements/rdo-release/README.md b/elements/rdo-release/README.md deleted file mode 100644 index eab140e82..000000000 --- a/elements/rdo-release/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Enables the RDO yum repository for a released version of OpenStack on Red Hat -based operating systems. $RDO_RELEASE is set by default to the latest openstack -release. It can be overriden to select the version of RDO to install. -Set the environment variable to 'juno' to set the default version to -install to 'juno'. diff --git a/elements/rdo-release/environment.d/10-rdo-release-name.bash b/elements/rdo-release/environment.d/10-rdo-release-name.bash deleted file mode 100644 index ce07fba0f..000000000 --- a/elements/rdo-release/environment.d/10-rdo-release-name.bash +++ /dev/null @@ -1 +0,0 @@ -export RDO_RELEASE=${RDO_RELEASE:-kilo} diff --git a/elements/rdo-release/pre-install.d/10-rdo-release-repo b/elements/rdo-release/pre-install.d/10-rdo-release-repo deleted file mode 100755 index 8defa81e8..000000000 --- a/elements/rdo-release/pre-install.d/10-rdo-release-repo +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -rpm -q rdo-release || install-packages http://rdo.fedorapeople.org/openstack-$RDO_RELEASE/rdo-release-$RDO_RELEASE.rpm diff --git a/elements/rhel7-rdo-icehouse/README.md b/elements/rhel7-rdo-icehouse/README.md deleted file mode 100644 index 42ab2cfc6..000000000 --- a/elements/rhel7-rdo-icehouse/README.md +++ /dev/null @@ -1,7 +0,0 @@ -The rhel7-rdo-icehouse element produces image builds on RHEL7 using RDO -packages from OpenStack Icehouse. - -Any elements using an OpenStack project used in conjuction with this element -will have their install type set to package via package-installs element, and -the packages will be installed using the yum repository enabled by the -rdo-icehouse and rdo-release elements. diff --git a/elements/rhel7-rdo-icehouse/element-deps b/elements/rhel7-rdo-icehouse/element-deps deleted file mode 100644 index 02220a2ce..000000000 --- a/elements/rhel7-rdo-icehouse/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -baremetal -rhel7 -package-installs -rdo-icehouse -rdo-release \ No newline at end of file