openstack
/
magnum
Code Issues Proposed changes

Merge "Consolidate enable docker registery fragments"

This commit is contained in:
Jenkins 2016-09-06 21:11:42 +00:00 committed by Gerrit Code Review
parent 57e4f701ac cafda5620d
commit 3837da3b06
5 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/enable-docker-registry.sh → magnum/drivers/common/templates/fragments/enable-docker-registry.sh
View File

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion-fedora-ironic.yaml
View File

@ -305,7 +305,7 @@ resources:
type: OS::Heat::SoftwareConfig
properties:
group: ungrouped
config: {get_file: fragments/enable-docker-registry.sh}
config: {get_file: ../../common/templates/fragments/enable-docker-registry.sh}
enable_kube_proxy:
type: OS::Heat::SoftwareConfig

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

@ -312,7 +312,7 @@ resources:
type: OS::Heat::SoftwareConfig
properties:
group: ungrouped
config: {get_file: fragments/enable-docker-registry.sh}
config: {get_file: ../../common/templates/fragments/enable-docker-registry.sh}
enable_kube_proxy:
type: OS::Heat::SoftwareConfig

12
magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/enable-docker-registry.sh
View File

@ -1,12 +0,0 @@
#!/bin/sh
. /etc/sysconfig/heat-params
if [ "$REGISTRY_ENABLED" = "False" ]; then
exit 0
fi
echo "starting docker registry ..."
systemctl daemon-reload
systemctl enable registry
systemctl --no-block start registry

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

@ -285,7 +285,7 @@ resources:
type: OS::Heat::SoftwareConfig
properties:
group: ungrouped
config: {get_file: fragments/enable-docker-registry.sh}
config: {get_file: ../../common/templates/fragments/enable-docker-registry.sh}
enable_services:
type: "OS::Heat::SoftwareConfig"