From bc7caaeba2d75725ec2e99154907d95d2f5b266b Mon Sep 17 00:00:00 2001 From: "Brandon B. Jozsa" Date: Tue, 7 Mar 2017 09:59:01 -0500 Subject: [PATCH] feat: removal of openstack chart (#245) * removal of openstack chart * removal of openstack in Makefile --- Makefile | 8 +++----- openstack/.helmignore | 27 --------------------------- openstack/Chart.yaml | 18 ------------------ openstack/requirements.yaml | 30 ------------------------------ openstack/values.yaml | 32 -------------------------------- 5 files changed, 3 insertions(+), 112 deletions(-) delete mode 100644 openstack/.helmignore delete mode 100755 openstack/Chart.yaml delete mode 100644 openstack/requirements.yaml delete mode 100644 openstack/values.yaml diff --git a/Makefile b/Makefile index 1dfa20f521..2697615c48 100644 --- a/Makefile +++ b/Makefile @@ -12,15 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -.PHONY: ceph bootstrap mariadb etcd postgresql keystone memcached rabbitmq helm-toolkit openstack neutron nova cinder heat maas all clean +.PHONY: ceph bootstrap mariadb etcd postgresql keystone memcached rabbitmq helm-toolkit neutron nova cinder heat maas all clean B64_DIRS := helm-toolkit/secrets B64_EXCLUDE := $(wildcard helm-toolkit/secrets/*.b64) -CHARTS := ceph mariadb etcd postgresql rabbitmq memcached keystone glance horizon neutron nova cinder heat maas openstack +CHARTS := ceph mariadb etcd postgresql rabbitmq memcached keystone glance horizon neutron nova cinder heat maas TOOLKIT_TPL := helm-toolkit/templates/_globals.tpl -all: helm-toolkit ceph bootstrap mariadb etcd postgresql rabbitmq memcached keystone glance horizon neutron nova cinder heat maas openstack +all: helm-toolkit ceph bootstrap mariadb etcd postgresql rabbitmq memcached keystone glance horizon neutron nova cinder heat maas helm-toolkit: build-helm-toolkit @@ -55,8 +55,6 @@ maas: build-maas memcached: build-memcached -openstack: build-openstack - clean: $(shell rm -rf helm-toolkit/secrets/*.b64) $(shell rm -rf */templates/_partials.tpl) diff --git a/openstack/.helmignore b/openstack/.helmignore deleted file mode 100644 index 302b9211d4..0000000000 --- a/openstack/.helmignore +++ /dev/null @@ -1,27 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj - -bin/ -etc/ -patches/ -*.py -Makefile \ No newline at end of file diff --git a/openstack/Chart.yaml b/openstack/Chart.yaml deleted file mode 100755 index 19e9e7ebfb..0000000000 --- a/openstack/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -description: A Helm chart for Kubernetes -name: openstack -version: 0.1.0 diff --git a/openstack/requirements.yaml b/openstack/requirements.yaml deleted file mode 100644 index 0e3319d685..0000000000 --- a/openstack/requirements.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -dependencies: - - name: helm-toolkit - version: 0.1.0 - repository: http://localhost:8879/charts - - name: memcached - repository: http://localhost:8879/charts - version: 0.1.0 - - name: rabbitmq - repository: http://localhost:8879/charts - version: 0.1.0 - - name: mariadb - repository: http://localhost:8879/charts - version: 0.1.0 - - name: keystone - repository: http://localhost:8879/charts - version: 0.1.0 diff --git a/openstack/values.yaml b/openstack/values.yaml deleted file mode 100644 index d9aba7c63b..0000000000 --- a/openstack/values.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Default values for openstack. -# This is a YAML-formatted file. -# Declare name/value pairs to be passed into your templates. -# name: value - -mariadb: - images: - mariadb: quay.io/stackanetes/stackanetes-mariadb:newton - volume: - size: 20Gi - labels: - control_node_label: openstack-control-plane - - images: - ceph_rbd_job: quay.io/attcomdev/ceph-daemon:latest - - labels: - control_node_label: openstack-control-plane