openstack
/
magnum
Code Issues Proposed changes

Merge "Move common/fragments into templates directory"

This commit is contained in:
Jenkins 2016-07-26 11:37:12 +00:00 committed by Gerrit Code Review
parent 100cdedeaa 966e6d9885
commit 2d09da0b68
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
magnum/drivers/common/fragments/configure_docker_storage_driver_atomic.sh → magnum/drivers/common/templates/fragments/configure_docker_storage_driver_atomic.sh
View File

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
View File

@ -268,7 +268,7 @@ resources:
config:
str_replace:
params:
$configure_docker_storage_driver: {get_file: ../../common/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
template: {get_file: fragments/configure-docker-storage.sh}
configure_etcd:

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
View File

@ -275,7 +275,7 @@ resources:
config:
str_replace:
params:
$configure_docker_storage_driver: {get_file: ../../common/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
template: {get_file: fragments/configure-docker-storage.sh}
configure_docker_registry:

2
magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
View File

@ -261,7 +261,7 @@ resources:
config:
str_replace:
params:
$configure_docker_storage_driver: {get_file: ../../common/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
template: {get_file: fragments/configure-docker-storage.sh}
make_cert:

2
magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
View File

@ -234,7 +234,7 @@ resources:
config:
str_replace:
params:
$configure_docker_storage_driver: {get_file: ../../common/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
template: {get_file: fragments/configure-docker-storage.sh}
configure_docker_registry: