From e9f1e44d80d62f6710dc47e1f7d11c7a52b10f8e Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 9 Oct 2014 17:10:36 -0400 Subject: [PATCH] Set distro correctly for rhel7 We were still configuring the elements for fedora even when using the rhel7 json file, which caused some necessary elements to be missed. --- elements/rhel7-distro/element-provides | 1 + elements/rhel7-distro/environment.d/00-rhel7-distro.bash | 1 + json-files/rhel-7-undercloud-source.json | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 elements/rhel7-distro/element-provides create mode 100644 elements/rhel7-distro/environment.d/00-rhel7-distro.bash diff --git a/elements/rhel7-distro/element-provides b/elements/rhel7-distro/element-provides new file mode 100644 index 000000000..a72e04969 --- /dev/null +++ b/elements/rhel7-distro/element-provides @@ -0,0 +1 @@ +operating-system diff --git a/elements/rhel7-distro/environment.d/00-rhel7-distro.bash b/elements/rhel7-distro/environment.d/00-rhel7-distro.bash new file mode 100644 index 000000000..c692d68bd --- /dev/null +++ b/elements/rhel7-distro/environment.d/00-rhel7-distro.bash @@ -0,0 +1 @@ +export DISTRO_NAME="rhel7" diff --git a/json-files/rhel-7-undercloud-source.json b/json-files/rhel-7-undercloud-source.json index 905232c19..8639eb8d4 100644 --- a/json-files/rhel-7-undercloud-source.json +++ b/json-files/rhel-7-undercloud-source.json @@ -20,8 +20,8 @@ "element": [ "base", "undercloud-install", - "fedora", - "fedora-distro", + "rhel7", + "rhel7-distro", "boot-stack", "nova-ironic", "os-collect-config",