openstack
/
magnum
Code Issues Proposed changes

Merge "Swarm: move write-docker-service.sh before other configure scripts"

This commit is contained in:
Jenkins 2015-09-25 23:31:13 +00:00 committed by Gerrit Code Review
parent 860f0ea2ec 3533f462cb
commit 4f24b74a87
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
magnum/templates/docker-swarm/fragments/make_cert.py → magnum/templates/docker-swarm/fragments/make-cert.py
View File

6
magnum/templates/docker-swarm/swarm.yaml
View File

@ -210,7 +210,7 @@ resources:
type: "OS::Heat::SoftwareConfig"
properties:
group: ungrouped
config: {get_file: fragments/make_cert.py}
config: {get_file: fragments/make-cert.py}
write_docker_service:
type: "OS::Heat::SoftwareConfig"
@ -289,13 +289,13 @@ resources:
- config: {get_resource: disable_selinux}
- config: {get_resource: remove_docker_key}
- config: {get_resource: write_heat_params}
- config: {get_resource: configure_swarm}
- config: {get_resource: add_proxy}
- config: {get_resource: make_cert}
- config: {get_resource: write_docker_service}
- config: {get_resource: write_docker_socket}
- config: {get_resource: write_swarm_agent_service}
- config: {get_resource: write_swarm_master_service}
- config: {get_resource: configure_swarm}
- config: {get_resource: add_proxy}
- config: {get_resource: enable_services}
- config: {get_resource: cfn_signal}

6
magnum/templates/docker-swarm/swarmnode.yaml
View File

@ -157,7 +157,7 @@ resources:
type: "OS::Heat::SoftwareConfig"
properties:
group: ungrouped
config: {get_file: fragments/make_cert.py}
config: {get_file: fragments/make-cert.py}
write_docker_service:
type: "OS::Heat::SoftwareConfig"
@ -222,11 +222,11 @@ resources:
- config: {get_resource: remove_docker_key}
- config: {get_resource: write_heat_params}
- config: {get_resource: make_cert}
- config: {get_resource: configure_swarm}
- config: {get_resource: add_proxy}
- config: {get_resource: write_swarm_agent_service}
- config: {get_resource: write_docker_service}
- config: {get_resource: write_docker_socket}
- config: {get_resource: configure_swarm}
- config: {get_resource: add_proxy}
- config: {get_resource: enable_services}
- config: {get_resource: cfn_signal}