openstack
/
magnum
Code Issues Proposed changes

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

In Ic88edf4b2e0005f6aa0a6df33b94ff275a5623d2,
we changed write-docker-service.yaml to write-docker-service.sh, this bring
a regression bug, before write-docker-service.sh being called,
/etc/systemd/system/docker.service.d/ was not created yet, this leading
add_proxy scripts failed.

This patch moves configure_swarm and add_proxy after write-docker-service.
Besids, rename make_cert.py to make-cert.py to consistent with other shell
scrpts naming style.

Change-Id: Ia7fcc029189047ae6424a26ac4cb6b4b785552db
Closes-Bug: #1499588
This commit is contained in:
Eli Qiao 2015-09-25 13:50:58 +08:00
parent 59accc5e37
commit 3533f462cb
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}