Merge "Consolidate enable docker registery fragments"
This commit is contained in:
commit
3837da3b06
|
@ -305,7 +305,7 @@ resources:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-docker-registry.sh}
|
config: {get_file: ../../common/templates/fragments/enable-docker-registry.sh}
|
||||||
|
|
||||||
enable_kube_proxy:
|
enable_kube_proxy:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
|
|
@ -312,7 +312,7 @@ resources:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-docker-registry.sh}
|
config: {get_file: ../../common/templates/fragments/enable-docker-registry.sh}
|
||||||
|
|
||||||
enable_kube_proxy:
|
enable_kube_proxy:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
|
|
@ -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
|
|
|
@ -285,7 +285,7 @@ resources:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-docker-registry.sh}
|
config: {get_file: ../../common/templates/fragments/enable-docker-registry.sh}
|
||||||
|
|
||||||
enable_services:
|
enable_services:
|
||||||
type: "OS::Heat::SoftwareConfig"
|
type: "OS::Heat::SoftwareConfig"
|
||||||
|
|
Loading…
Reference in New Issue