From 0c83db08c7c13b2bc66983e8ea8bb65d7b929e4b Mon Sep 17 00:00:00 2001 From: Vijendar Komalla Date: Fri, 16 Sep 2016 10:50:09 -0500 Subject: [PATCH] Delete coreos driver elements directory We don not need these files any more. They are for fedora-k8s-ironic and they are in place. Change-Id: I586fbdb4568abff89b70c9f792728b3a2c0508a0 --- .../templates/elements/README.md | 29 ------------------- .../elements/kubernetes/elements-deps | 1 - .../elements/kubernetes/package-installs.yaml | 4 --- 3 files changed, 34 deletions(-) delete mode 100644 magnum/drivers/k8s_coreos_v1/templates/elements/README.md delete mode 100644 magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/elements-deps delete mode 100644 magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/package-installs.yaml diff --git a/magnum/drivers/k8s_coreos_v1/templates/elements/README.md b/magnum/drivers/k8s_coreos_v1/templates/elements/README.md deleted file mode 100644 index f996087c98..0000000000 --- a/magnum/drivers/k8s_coreos_v1/templates/elements/README.md +++ /dev/null @@ -1,29 +0,0 @@ -Kubernetes elements -=================== - -This directory contains `[diskimage-builder](https://github.com/openstack/diskimage-builder)` -elements to build an image which contains kubernetes required to use kubecluster-fedora-ironic.yaml. - -An example fedora based image and uploaded to glance with the following: - - git clone https://git.openstack.org/openstack/magnum - git clone https://git.openstack.org/openstack/diskimage-builder.git - git clone https://git.openstack.org/openstack/tripleo-image-elements.git - git clone https://git.openstack.org/openstack/heat-templates.git - git clone https://git.openstack.org/openstack/dib-utils.git - export PATH="${PWD}/dib-utils/bin:$PATH" - export ELEMENTS_PATH=tripleo-image-elements/elements:heat-templates/hot/software-config/elements - export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/etc/magnum/templates/kubernetes/elements - export DIB_RELEASE=21 - diskimage-builder/bin/disk-image-create baremetal \ - fedora selinux-permissive \ - os-collect-config \ - os-refresh-config \ - os-apply-config \ - heat-config-script \ - kubernetes \ - -o fedora-21-kubernetes.qcow2 - - KERNEL_ID=`glance image-create --name fedora-k8s-kernel --visibility public --disk-format=aki --container-format=aki --file=fedora-21-kubernetes.vmlinuz | grep id | tr -d '| ' | cut --bytes=3-57` - RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk --visibility public --disk-format=ari --container-format=ari --file=fedora-21-kubernetes.initrd | grep id | tr -d '| ' | cut --bytes=3-57` - BASE_ID=`glance image-create --name fedora-k8s --visibility public --disk-format=qcow2 --container-format=bare --property kernel_id=$KERNEL_ID --property ramdisk_id=$RAMDISK_ID --file=fedora-21-kubernetes.qcow2 | grep -v kernel | grep -v ramdisk | grep id | tr -d '| ' | cut --bytes=3-57` diff --git a/magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/elements-deps b/magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/elements-deps deleted file mode 100644 index 7076aba945..0000000000 --- a/magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/elements-deps +++ /dev/null @@ -1 +0,0 @@ -package-installs diff --git a/magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/package-installs.yaml b/magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/package-installs.yaml deleted file mode 100644 index ea99a147d8..0000000000 --- a/magnum/drivers/k8s_coreos_v1/templates/elements/kubernetes/package-installs.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kubernetes: -etcd: -flannel: -docker-io: \ No newline at end of file