Rename scripts

Scripts are the core of Magnum for COE deployment. To be more
clear and consistent, two changes proposed in this patch:

1. Rename network related script to xxx-flannel-xxx given they
are all for flannel and now we have calico driver.

2. Adding .sh for some scripts to be consistent with others.

Change-Id: I1a8dfe21d4ff0c58f7f52ebea05c9b22dff16bf0
This commit is contained in:
Feilong Wang 2018-04-19 15:09:26 +12:00
parent 4292b862a3
commit 591a2dc94a
11 changed files with 24 additions and 24 deletions

View File

@ -516,13 +516,13 @@ resources:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/write-network-config.sh} config: {get_file: ../../common/templates/kubernetes/fragments/write-flannel-config.sh}
network_config_service: network_config_service:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/network-config-service.sh} config: {get_file: ../../common/templates/kubernetes/fragments/flannel-config-service.sh}
enable_services: enable_services:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -575,8 +575,8 @@ resources:
- config: {get_resource: add_proxy} - config: {get_resource: add_proxy}
- config: {get_resource: start_container_agent} - config: {get_resource: start_container_agent}
- config: {get_resource: enable_services} - config: {get_resource: enable_services}
- config: {get_resource: write_network_config} - config: {get_resource: write_flannel_config}
- config: {get_resource: network_config_service} - config: {get_resource: flannel_config_service}
- config: {get_resource: kube_apiserver_to_kubelet_role} - config: {get_resource: kube_apiserver_to_kubelet_role}
- config: {get_resource: master_wc_notify} - config: {get_resource: master_wc_notify}
@ -600,7 +600,7 @@ resources:
group: script group: script
config: config:
str_replace: str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring} template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh}
params: params:
"$ADMIN_PASSWD": {get_param: grafana_admin_passwd} "$ADMIN_PASSWD": {get_param: grafana_admin_passwd}
@ -618,7 +618,7 @@ resources:
group: script group: script
config: config:
str_replace: str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager} template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager.sh}
params: params:
"$CA_KEY": {get_param: ca_key} "$CA_KEY": {get_param: ca_key}
@ -651,8 +651,8 @@ resources:
config: config:
str_replace: str_replace:
params: params:
$enable-ingress-traefik: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-traefik} $enable-ingress-traefik: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-traefik.sh}
template: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-controller} template: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-controller.sh}
enable_ingress_controller_deployment: enable_ingress_controller_deployment:
type: OS::Heat::SoftwareDeployment type: OS::Heat::SoftwareDeployment

View File

@ -379,11 +379,11 @@ resources:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh} config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh}
network_service: flannel_service:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh} config: {get_file: ../../common/templates/kubernetes/fragments/flannel-service.sh}
enable_services: enable_services:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -445,7 +445,7 @@ resources:
- config: {get_resource: configure_docker_storage} - config: {get_resource: configure_docker_storage}
- config: {get_resource: configure_docker_registry} - config: {get_resource: configure_docker_registry}
- config: {get_resource: configure_kubernetes_minion} - config: {get_resource: configure_kubernetes_minion}
- config: {get_resource: network_service} - config: {get_resource: flannel_service}
- config: {get_resource: add_proxy} - config: {get_resource: add_proxy}
- config: {get_resource: enable_services} - config: {get_resource: enable_services}
- config: {get_resource: enable_node_exporter} - config: {get_resource: enable_node_exporter}

View File

@ -373,17 +373,17 @@ resources:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-master.sh} config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-master.sh}
write_network_config: write_flannel_config:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/write-network-config.sh} config: {get_file: ../../common/templates/kubernetes/fragments/write-flannel-config.sh}
network_config_service: flannel_config_service:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/network-config-service.sh} config: {get_file: ../../common/templates/kubernetes/fragments/flannel-config-service.sh}
enable_services: enable_services:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -391,11 +391,11 @@ resources:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/enable-services-master.sh} config: {get_file: ../../common/templates/kubernetes/fragments/enable-services-master.sh}
network_service: flannel_service:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh} config: {get_file: ../../common/templates/kubernetes/fragments/flannel-service.sh}
enable_kube_controller_manager_scheduler: enable_kube_controller_manager_scheduler:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -459,9 +459,9 @@ resources:
- config: {get_resource: configure_kubernetes} - config: {get_resource: configure_kubernetes}
- config: {get_resource: add_proxy} - config: {get_resource: add_proxy}
- config: {get_resource: enable_services} - config: {get_resource: enable_services}
- config: {get_resource: write_network_config} - config: {get_resource: write_flannel_config}
- config: {get_resource: network_config_service} - config: {get_resource: flannel_config_service}
- config: {get_resource: network_service} - config: {get_resource: flannel_service}
- config: {get_resource: kube_apiserver_to_kubelet_role} - config: {get_resource: kube_apiserver_to_kubelet_role}
- config: {get_resource: enable_kube_controller_manager_scheduler} - config: {get_resource: enable_kube_controller_manager_scheduler}
- config: {get_resource: enable_kube_proxy} - config: {get_resource: enable_kube_proxy}
@ -475,7 +475,7 @@ resources:
group: script group: script
config: config:
str_replace: str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring} template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh}
params: params:
"$ADMIN_PASSWD": {get_param: grafana_admin_passwd} "$ADMIN_PASSWD": {get_param: grafana_admin_passwd}

View File

@ -277,11 +277,11 @@ resources:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh} config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh}
network_service: flannel_service:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
group: ungrouped group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh} config: {get_file: ../../common/templates/kubernetes/fragments/flannel-service.sh}
enable_services: enable_services:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -348,7 +348,7 @@ resources:
- config: {get_resource: configure_docker_storage} - config: {get_resource: configure_docker_storage}
- config: {get_resource: configure_docker_registry} - config: {get_resource: configure_docker_registry}
- config: {get_resource: configure_kubernetes_minion} - config: {get_resource: configure_kubernetes_minion}
- config: {get_resource: network_service} - config: {get_resource: flannel_service}
- config: {get_resource: add_proxy} - config: {get_resource: add_proxy}
- config: {get_resource: enable_services} - config: {get_resource: enable_services}
- config: {get_resource: enable_kube_proxy} - config: {get_resource: enable_kube_proxy}