Renaming helm-toolkit directory

To avoid conflict between openstack-helm's helm-toolkit, we are renaming contrail-helm-deployers helm-toolkit chart as helm-toolkit-contrail Change-Id: I6ec5b64d8015b73099691c96b7e325d437e3f4ab Partial-Bug: #1749018
Juniper · Mar 16, 2018 · 2fd56af · 2fd56af
1 parent 63a204a
commit 2fd56af
Show file tree

Hide file tree

Showing 53 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 
 HELM := helm
-FILTER_CHARTS := helm-toolkit
+FILTER_CHARTS := helm-toolkit-contrail
 CONTRAIL_CHARTS := $(FILTER_CHARTS) $(filter-out $(FILTER_CHARTS), $(patsubst %/Chart.yaml, %, $(wildcard */Chart.yaml)))
 BUILD_CHARTS := $(foreach chart, $(CONTRAIL_CHARTS), build-$(chart))
 

diff --git a/contrail-analytics/requirements.yaml b/contrail-analytics/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
-  - name: helm-toolkit
+  - name: helm-toolkit-contrail
     repository: http://localhost:8879/charts
     version: 0.1.0
diff --git a/contrail-controller/requirements.yaml b/contrail-controller/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
-  - name: helm-toolkit
+  - name: helm-toolkit-contrail
     repository: http://localhost:8879/charts
     version: 0.1.0
diff --git a/contrail-thirdparty/requirements.yaml b/contrail-thirdparty/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
-  - name: helm-toolkit
+  - name: helm-toolkit-contrail
     repository: http://localhost:8879/charts
     version: 0.1.0
diff --git a/contrail-vrouter/requirements.yaml b/contrail-vrouter/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
-  - name: helm-toolkit
+  - name: helm-toolkit-contrail
     repository: http://localhost:8879/charts
     version: 0.1.0
diff --git a/helm-toolkit/.gitignore → helm-toolkit-contrail/.gitignore b/helm-toolkit/.gitignore → helm-toolkit-contrail/.gitignore
diff --git a/helm-toolkit/.helmignore → helm-toolkit-contrail/.helmignore b/helm-toolkit/.helmignore → helm-toolkit-contrail/.helmignore
diff --git a/helm-toolkit/Chart.yaml → helm-toolkit-contrail/Chart.yaml b/helm-toolkit/Chart.yaml → helm-toolkit-contrail/Chart.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 apiVersion: v1
-description: OpenStack-Helm Helm-Toolkit
-name: helm-toolkit
+description: OpenStack-Helm Helm-Toolkit for contrail
+name: helm-toolkit-contrail
 version: 0.1.0
diff --git a/helm-toolkit/Makefile → helm-toolkit-contrail/Makefile b/helm-toolkit/Makefile → helm-toolkit-contrail/Makefile
diff --git a/helm-toolkit/requirements.yaml → helm-toolkit-contrail/requirements.yaml b/helm-toolkit/requirements.yaml → helm-toolkit-contrail/requirements.yaml
diff --git a/...ts/_authenticated_endpoint_uri_lookup.tpl → ...ts/_authenticated_endpoint_uri_lookup.tpl b/...ts/_authenticated_endpoint_uri_lookup.tpl → ...ts/_authenticated_endpoint_uri_lookup.tpl
diff --git a/...lates/endpoints/_endpoint_port_lookup.tpl → ...lates/endpoints/_endpoint_port_lookup.tpl b/...lates/endpoints/_endpoint_port_lookup.tpl → ...lates/endpoints/_endpoint_port_lookup.tpl
diff --git a/...ts/_host_and_port_endpoint_uri_lookup.tpl → ...ts/_host_and_port_endpoint_uri_lookup.tpl b/...ts/_host_and_port_endpoint_uri_lookup.tpl → ...ts/_host_and_port_endpoint_uri_lookup.tpl
diff --git a/...points/_hostname_fqdn_endpoint_lookup.tpl → ...points/_hostname_fqdn_endpoint_lookup.tpl b/...points/_hostname_fqdn_endpoint_lookup.tpl → ...points/_hostname_fqdn_endpoint_lookup.tpl
diff --git a/.../_hostname_namespaced_endpoint_lookup.tpl → .../_hostname_namespaced_endpoint_lookup.tpl b/.../_hostname_namespaced_endpoint_lookup.tpl → .../_hostname_namespaced_endpoint_lookup.tpl
diff --git a/...oints/_hostname_short_endpoint_lookup.tpl → ...oints/_hostname_short_endpoint_lookup.tpl b/...oints/_hostname_short_endpoint_lookup.tpl → ...oints/_hostname_short_endpoint_lookup.tpl
diff --git a/...points/_keystone_endpoint_name_lookup.tpl → ...points/_keystone_endpoint_name_lookup.tpl b/...points/_keystone_endpoint_name_lookup.tpl → ...points/_keystone_endpoint_name_lookup.tpl
diff --git a/...points/_keystone_endpoint_path_lookup.tpl → ...points/_keystone_endpoint_path_lookup.tpl b/...points/_keystone_endpoint_path_lookup.tpl → ...points/_keystone_endpoint_path_lookup.tpl
diff --git a/...dpoints/_keystone_endpoint_uri_lookup.tpl → ...dpoints/_keystone_endpoint_uri_lookup.tpl b/...dpoints/_keystone_endpoint_uri_lookup.tpl → ...dpoints/_keystone_endpoint_uri_lookup.tpl
diff --git a/...e_name_endpoint_with_namespace_lookup.tpl → ...e_name_endpoint_with_namespace_lookup.tpl b/...e_name_endpoint_with_namespace_lookup.tpl → ...e_name_endpoint_with_namespace_lookup.tpl
diff --git a/...toolkit/templates/scripts/_db-drop.py.tpl → ...ontrail/templates/scripts/_db-drop.py.tpl b/...toolkit/templates/scripts/_db-drop.py.tpl → ...ontrail/templates/scripts/_db-drop.py.tpl
diff --git a/...toolkit/templates/scripts/_db-init.py.tpl → ...ontrail/templates/scripts/_db-init.py.tpl b/...toolkit/templates/scripts/_db-init.py.tpl → ...ontrail/templates/scripts/_db-init.py.tpl
diff --git a/.../templates/scripts/_ks-domain-user.sh.tpl → .../templates/scripts/_ks-domain-user.sh.tpl b/.../templates/scripts/_ks-domain-user.sh.tpl → .../templates/scripts/_ks-domain-user.sh.tpl
diff --git a/...it/templates/scripts/_ks-endpoints.sh.tpl → ...il/templates/scripts/_ks-endpoints.sh.tpl b/...it/templates/scripts/_ks-endpoints.sh.tpl → ...il/templates/scripts/_ks-endpoints.sh.tpl
diff --git a/...lkit/templates/scripts/_ks-service.sh.tpl → ...rail/templates/scripts/_ks-service.sh.tpl b/...lkit/templates/scripts/_ks-service.sh.tpl → ...rail/templates/scripts/_ks-service.sh.tpl
diff --git a/...toolkit/templates/scripts/_ks-user.sh.tpl → ...ontrail/templates/scripts/_ks-user.sh.tpl b/...toolkit/templates/scripts/_ks-user.sh.tpl → ...ontrail/templates/scripts/_ks-user.sh.tpl
diff --git a/...lkit/templates/scripts/_rally_test.sh.tpl → ...rail/templates/scripts/_rally_test.sh.tpl b/...lkit/templates/scripts/_rally_test.sh.tpl → ...rail/templates/scripts/_rally_test.sh.tpl
diff --git a/...es/snippets/_keystone_openrc_env_vars.tpl → ...es/snippets/_keystone_openrc_env_vars.tpl b/...es/snippets/_keystone_openrc_env_vars.tpl → ...es/snippets/_keystone_openrc_env_vars.tpl
diff --git a/...ates/snippets/_keystone_secret_openrc.tpl → ...ates/snippets/_keystone_secret_openrc.tpl b/...ates/snippets/_keystone_secret_openrc.tpl → ...ates/snippets/_keystone_secret_openrc.tpl
diff --git a/...ippets/_keystone_user_create_env_vars.tpl → ...ippets/_keystone_user_create_env_vars.tpl b/...ippets/_keystone_user_create_env_vars.tpl → ...ippets/_keystone_user_create_env_vars.tpl
diff --git a/..._kubernetes_entrypoint_init_container.tpl → ..._kubernetes_entrypoint_init_container.tpl b/..._kubernetes_entrypoint_init_container.tpl → ..._kubernetes_entrypoint_init_container.tpl
diff --git a/...s/snippets/_kubernetes_kubectl_params.tpl → ...s/snippets/_kubernetes_kubectl_params.tpl b/...s/snippets/_kubernetes_kubectl_params.tpl → ...s/snippets/_kubernetes_kubectl_params.tpl
diff --git a/.../snippets/_kubernetes_metadata_labels.tpl → .../snippets/_kubernetes_metadata_labels.tpl b/.../snippets/_kubernetes_metadata_labels.tpl → .../snippets/_kubernetes_metadata_labels.tpl
diff --git a/...nippets/_kubernetes_pod_anti_affinity.tpl → ...nippets/_kubernetes_pod_anti_affinity.tpl b/...nippets/_kubernetes_pod_anti_affinity.tpl → ...nippets/_kubernetes_pod_anti_affinity.tpl
diff --git a/...s/snippets/_kubernetes_pod_rbac_roles.tpl → ...s/snippets/_kubernetes_pod_rbac_roles.tpl b/...s/snippets/_kubernetes_pod_rbac_roles.tpl → ...s/snippets/_kubernetes_pod_rbac_roles.tpl
diff --git a/...s/_kubernetes_pod_rbac_serviceaccount.tpl → ...s/_kubernetes_pod_rbac_serviceaccount.tpl b/...s/_kubernetes_pod_rbac_serviceaccount.tpl → ...s/_kubernetes_pod_rbac_serviceaccount.tpl
diff --git a/...plates/snippets/_kubernetes_resources.tpl → ...plates/snippets/_kubernetes_resources.tpl b/...plates/snippets/_kubernetes_resources.tpl → ...plates/snippets/_kubernetes_resources.tpl
diff --git a/...ippets/_kubernetes_upgrades_daemonset.tpl → ...ippets/_kubernetes_upgrades_daemonset.tpl b/...ippets/_kubernetes_upgrades_daemonset.tpl → ...ippets/_kubernetes_upgrades_daemonset.tpl
diff --git a/...ppets/_kubernetes_upgrades_deployment.tpl → ...ppets/_kubernetes_upgrades_deployment.tpl b/...ppets/_kubernetes_upgrades_deployment.tpl → ...ppets/_kubernetes_upgrades_deployment.tpl
diff --git a/.../snippets/_prometheus_pod_annotations.tpl → .../snippets/_prometheus_pod_annotations.tpl b/.../snippets/_prometheus_pod_annotations.tpl → .../snippets/_prometheus_pod_annotations.tpl
diff --git a/...ppets/_prometheus_service_annotations.tpl → ...ppets/_prometheus_service_annotations.tpl b/...ppets/_prometheus_service_annotations.tpl → ...ppets/_prometheus_service_annotations.tpl
diff --git a/...ates/utils/_comma_joined_service_list.tpl → ...ates/utils/_comma_joined_service_list.tpl b/...ates/utils/_comma_joined_service_list.tpl → ...ates/utils/_comma_joined_service_list.tpl
diff --git a/.../templates/utils/_configmap_templater.tpl → .../templates/utils/_configmap_templater.tpl b/.../templates/utils/_configmap_templater.tpl → .../templates/utils/_configmap_templater.tpl
diff --git a/.../templates/utils/_daemonset_overrides.tpl → .../templates/utils/_daemonset_overrides.tpl b/.../templates/utils/_daemonset_overrides.tpl → .../templates/utils/_daemonset_overrides.tpl
diff --git a/helm-toolkit/templates/utils/_hash.tpl → ...oolkit-contrail/templates/utils/_hash.tpl b/helm-toolkit/templates/utils/_hash.tpl → ...oolkit-contrail/templates/utils/_hash.tpl
diff --git a/...it/templates/utils/_joinListWithComma.tpl → ...il/templates/utils/_joinListWithComma.tpl b/...it/templates/utils/_joinListWithComma.tpl → ...il/templates/utils/_joinListWithComma.tpl
diff --git a/...it/templates/utils/_joinListWithSpace.tpl → ...il/templates/utils/_joinListWithSpace.tpl b/...it/templates/utils/_joinListWithSpace.tpl → ...il/templates/utils/_joinListWithSpace.tpl
diff --git a/helm-toolkit/templates/utils/_template.tpl → ...it-contrail/templates/utils/_template.tpl b/helm-toolkit/templates/utils/_template.tpl → ...it-contrail/templates/utils/_template.tpl
diff --git a/helm-toolkit/templates/utils/_to_ini.tpl → ...lkit-contrail/templates/utils/_to_ini.tpl b/helm-toolkit/templates/utils/_to_ini.tpl → ...lkit-contrail/templates/utils/_to_ini.tpl
diff --git a/...lkit/templates/utils/_to_k8s_env_vars.tpl → ...rail/templates/utils/_to_k8s_env_vars.tpl b/...lkit/templates/utils/_to_k8s_env_vars.tpl → ...rail/templates/utils/_to_k8s_env_vars.tpl
diff --git a/helm-toolkit/templates/utils/_to_kv_list.tpl → ...-contrail/templates/utils/_to_kv_list.tpl b/helm-toolkit/templates/utils/_to_kv_list.tpl → ...-contrail/templates/utils/_to_kv_list.tpl
diff --git a/...toolkit/templates/utils/_to_oslo_conf.tpl → ...ontrail/templates/utils/_to_oslo_conf.tpl b/...toolkit/templates/utils/_to_oslo_conf.tpl → ...ontrail/templates/utils/_to_oslo_conf.tpl
diff --git a/helm-toolkit/values.yaml → helm-toolkit-contrail/values.yaml b/helm-toolkit/values.yaml → helm-toolkit-contrail/values.yaml