Merge "Revert "Rename scripts""

This commit is contained in:
Zuul 2018-07-05 14:40:49 +00:00 committed by Gerrit Code Review
commit 3d136642b5
11 changed files with 24 additions and 24 deletions

View File

@ -538,13 +538,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
@ -597,8 +597,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}
@ -622,7 +622,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}
@ -640,7 +640,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}
@ -673,8 +673,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

View File

@ -387,11 +387,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
@ -453,7 +453,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}

View File

@ -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}

View File

@ -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}