Browse Source

Merge "Rename scripts"

changes/84/579484/6
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
9375dc2ae5
11 changed files with 26 additions and 26 deletions
  1. +0
    -0
      magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh
  2. +0
    -0
      magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh
  3. +0
    -0
      magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh
  4. +0
    -0
      magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
  5. +0
    -0
      magnum/drivers/common/templates/kubernetes/fragments/flannel-config-service.sh
  6. +0
    -0
      magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh
  7. +0
    -0
      magnum/drivers/common/templates/kubernetes/fragments/write-flannel-config.sh
  8. +10
    -10
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
  9. +3
    -3
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
  10. +10
    -10
      magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml
  11. +3
    -3
      magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml

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


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


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


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


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


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


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


+ 10
- 10
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml View File

@ -534,17 +534,17 @@ resources:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-master.sh}
write_network_config:
write_flannel_config:
type: OS::Heat::SoftwareConfig
properties:
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
properties:
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:
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_network_config}
- config: {get_resource: network_config_service}
- config: {get_resource: write_flannel_config}
- config: {get_resource: flannel_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}
template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh}
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}
template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager.sh}
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}
template: {get_file: ../../common/templates/kubernetes/fragments/enable-ingress-controller}
$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_controller_deployment:
type: OS::Heat::SoftwareDeployment


+ 3
- 3
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml View File

@ -387,11 +387,11 @@ resources:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh}
network_service:
flannel_service:
type: OS::Heat::SoftwareConfig
properties:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh}
config: {get_file: ../../common/templates/kubernetes/fragments/flannel-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: network_service}
- config: {get_resource: flannel_service}
- config: {get_resource: add_proxy}
- config: {get_resource: enable_services}
- config: {get_resource: enable_node_exporter}


+ 10
- 10
magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml View File

@ -373,17 +373,17 @@ resources:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-master.sh}
write_network_config:
write_flannel_config:
type: OS::Heat::SoftwareConfig
properties:
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
properties:
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:
type: OS::Heat::SoftwareConfig
@ -391,11 +391,11 @@ resources:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/enable-services-master.sh}
network_service:
flannel_service:
type: OS::Heat::SoftwareConfig
properties:
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:
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_network_config}
- config: {get_resource: network_config_service}
- config: {get_resource: network_service}
- config: {get_resource: write_flannel_config}
- config: {get_resource: flannel_config_service}
- config: {get_resource: flannel_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}
template: {get_file: ../../common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh}
params:
"$ADMIN_PASSWD": {get_param: grafana_admin_passwd}


+ 3
- 3
magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml View File

@ -277,11 +277,11 @@ resources:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-minion.sh}
network_service:
flannel_service:
type: OS::Heat::SoftwareConfig
properties:
group: ungrouped
config: {get_file: ../../common/templates/kubernetes/fragments/network-service.sh}
config: {get_file: ../../common/templates/kubernetes/fragments/flannel-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: network_service}
- config: {get_resource: flannel_service}
- config: {get_resource: add_proxy}
- config: {get_resource: enable_services}
- config: {get_resource: enable_kube_proxy}


Loading…
Cancel
Save