From 97f086c19ff53e313ae0c128fab9214861a74c11 Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Thu, 5 Jul 2018 07:57:46 +0000 Subject: [PATCH] Revert "Rename scripts" This reverts commit 591a2dc94a1b2fd67fc89ba0f4a93719277a7a03. Change-Id: I38cd4b2d745b811f83480cd298ceadb86898cdf0 --- ...api-manager.sh => enable-cert-api-manager} | 0 ...ontroller.sh => enable-ingress-controller} | 0 ...ress-traefik.sh => enable-ingress-traefik} | 0 ...toring.sh => enable-prometheus-monitoring} | 0 ...g-service.sh => network-config-service.sh} | 0 ...{flannel-service.sh => network-service.sh} | 0 ...nnel-config.sh => write-network-config.sh} | 0 .../templates/kubemaster.yaml | 16 +++++++-------- .../templates/kubeminion.yaml | 6 +++--- .../templates/kubemaster.yaml | 20 +++++++++---------- .../kubeminion_software_configs.yaml | 6 +++--- 11 files changed, 24 insertions(+), 24 deletions(-) rename magnum/drivers/common/templates/kubernetes/fragments/{enable-cert-api-manager.sh => enable-cert-api-manager} (100%) rename magnum/drivers/common/templates/kubernetes/fragments/{enable-ingress-controller.sh => enable-ingress-controller} (100%) rename magnum/drivers/common/templates/kubernetes/fragments/{enable-ingress-traefik.sh => enable-ingress-traefik} (100%) rename magnum/drivers/common/templates/kubernetes/fragments/{enable-prometheus-monitoring.sh => enable-prometheus-monitoring} (100%) rename magnum/drivers/common/templates/kubernetes/fragments/{flannel-config-service.sh => network-config-service.sh} (100%) rename magnum/drivers/common/templates/kubernetes/fragments/{flannel-service.sh => network-service.sh} (100%) rename magnum/drivers/common/templates/kubernetes/fragments/{write-flannel-config.sh => write-network-config.sh} (100%) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager similarity index 100% rename from magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh rename to magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller similarity index 100% rename from magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh rename to magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik similarity index 100% rename from magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh rename to magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring similarity index 100% rename from magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh rename to magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring diff --git a/magnum/drivers/common/templates/kubernetes/fragments/flannel-config-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh similarity index 100% rename from magnum/drivers/common/templates/kubernetes/fragments/flannel-config-service.sh rename to magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh diff --git a/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/network-service.sh similarity index 100% rename from magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh rename to magnum/drivers/common/templates/kubernetes/fragments/network-service.sh diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-flannel-config.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-network-config.sh similarity index 100% rename from magnum/drivers/common/templates/kubernetes/fragments/write-flannel-config.sh rename to magnum/drivers/common/templates/kubernetes/fragments/write-network-config.sh diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index 62718041a4..6f4d716ed0 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -516,13 +516,13 @@ resources: type: OS::Heat::SoftwareConfig properties: group: ungrouped - config: {get_file: ../../common/templates/kubernetes/fragments/write-flannel-config.sh} + config: {get_file: ../../common/templates/kubernetes/fragments/write-network-config.sh} network_config_service: type: OS::Heat::SoftwareConfig properties: group: ungrouped - config: {get_file: ../../common/templates/kubernetes/fragments/flannel-config-service.sh} + config: {get_file: ../../common/templates/kubernetes/fragments/network-config-service.sh} enable_services: type: OS::Heat::SoftwareConfig @@ -575,8 +575,8 @@ resources: - config: {get_resource: add_proxy} - config: {get_resource: start_container_agent} - config: {get_resource: enable_services} - - config: {get_resource: write_flannel_config} - - config: {get_resource: flannel_config_service} + - config: {get_resource: write_network_config} + - config: {get_resource: network_config_service} - config: {get_resource: kube_apiserver_to_kubelet_role} - config: {get_resource: master_wc_notify} @@ -600,7 +600,7 @@ resources: group: script config: str_replace: - template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh} + template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring} params: "$ADMIN_PASSWD": {get_param: grafana_admin_passwd} @@ -618,7 +618,7 @@ resources: group: script config: str_replace: - template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager.sh} + template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager} params: "$CA_KEY": {get_param: ca_key} @@ -651,8 +651,8 @@ resources: config: str_replace: params: - $enable-ingress-traefik: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-traefik.sh} - template: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-controller.sh} + $enable-ingress-traefik: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-traefik} + template: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-controller} enable_ingress_controller_deployment: type: OS::Heat::SoftwareDeployment diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index 09a311edd9..341380c923 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -379,11 +379,11 @@ resources: group: ungrouped config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh} - flannel_service: + network_service: type: OS::Heat::SoftwareConfig properties: group: ungrouped - config: {get_file: ../../common/templates/kubernetes/fragments/flannel-service.sh} + config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh} enable_services: type: OS::Heat::SoftwareConfig @@ -445,7 +445,7 @@ resources: - config: {get_resource: configure_docker_storage} - config: {get_resource: configure_docker_registry} - config: {get_resource: configure_kubernetes_minion} - - config: {get_resource: flannel_service} + - config: {get_resource: network_service} - config: {get_resource: add_proxy} - config: {get_resource: enable_services} - config: {get_resource: enable_node_exporter} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml index 7169b34b2d..ee42e99bdb 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml @@ -373,17 +373,17 @@ resources: group: ungrouped config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-master.sh} - write_flannel_config: + write_network_config: type: OS::Heat::SoftwareConfig properties: group: ungrouped - config: {get_file: ../../common/templates/kubernetes/fragments/write-flannel-config.sh} + config: {get_file: ../../common/templates/kubernetes/fragments/write-network-config.sh} - flannel_config_service: + network_config_service: type: OS::Heat::SoftwareConfig properties: group: ungrouped - config: {get_file: ../../common/templates/kubernetes/fragments/flannel-config-service.sh} + config: {get_file: ../../common/templates/kubernetes/fragments/network-config-service.sh} enable_services: type: OS::Heat::SoftwareConfig @@ -391,11 +391,11 @@ resources: group: ungrouped config: {get_file: ../../common/templates/kubernetes/fragments/enable-services-master.sh} - flannel_service: + network_service: type: OS::Heat::SoftwareConfig properties: group: ungrouped - config: {get_file: ../../common/templates/kubernetes/fragments/flannel-service.sh} + config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh} enable_kube_controller_manager_scheduler: type: OS::Heat::SoftwareConfig @@ -459,9 +459,9 @@ resources: - config: {get_resource: configure_kubernetes} - config: {get_resource: add_proxy} - config: {get_resource: enable_services} - - config: {get_resource: write_flannel_config} - - config: {get_resource: flannel_config_service} - - config: {get_resource: flannel_service} + - config: {get_resource: write_network_config} + - config: {get_resource: network_config_service} + - config: {get_resource: network_service} - config: {get_resource: kube_apiserver_to_kubelet_role} - config: {get_resource: enable_kube_controller_manager_scheduler} - config: {get_resource: enable_kube_proxy} @@ -475,7 +475,7 @@ resources: group: script config: str_replace: - template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh} + template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring} params: "$ADMIN_PASSWD": {get_param: grafana_admin_passwd} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml index 6191bc2e40..e9abf11718 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml @@ -277,11 +277,11 @@ resources: group: ungrouped config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh} - flannel_service: + network_service: type: OS::Heat::SoftwareConfig properties: group: ungrouped - config: {get_file: ../../common/templates/kubernetes/fragments/flannel-service.sh} + config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh} enable_services: type: OS::Heat::SoftwareConfig @@ -348,7 +348,7 @@ resources: - config: {get_resource: configure_docker_storage} - config: {get_resource: configure_docker_registry} - config: {get_resource: configure_kubernetes_minion} - - config: {get_resource: flannel_service} + - config: {get_resource: network_service} - config: {get_resource: add_proxy} - config: {get_resource: enable_services} - config: {get_resource: enable_kube_proxy}