Browse Source

Revert "Rename scripts"

This reverts commit 591a2dc94a.

Change-Id: I38cd4b2d745b811f83480cd298ceadb86898cdf0
changes/14/580314/1
Spyros Trigazis 3 years ago
parent
commit
97f086c19f
  1. 0
      magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager
  2. 0
      magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller
  3. 0
      magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik
  4. 0
      magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring
  5. 0
      magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh
  6. 0
      magnum/drivers/common/templates/kubernetes/fragments/network-service.sh
  7. 0
      magnum/drivers/common/templates/kubernetes/fragments/write-network-config.sh
  8. 16
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
  9. 6
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
  10. 20
      magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml
  11. 6
      magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml

0
magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh → magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager

0
magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh → magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller

0
magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh → magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik

0
magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh → magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring

0
magnum/drivers/common/templates/kubernetes/fragments/flannel-config-service.sh → magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh

0
magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh → magnum/drivers/common/templates/kubernetes/fragments/network-service.sh

0
magnum/drivers/common/templates/kubernetes/fragments/write-flannel-config.sh → magnum/drivers/common/templates/kubernetes/fragments/write-network-config.sh

16
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

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

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

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

Loading…
Cancel
Save