Swarm: Add configure-swarm.sh to configure docker-storage

This patch adds configure-swarm.sh to configure docker-storage options

New options added to DOCKER_STORAGE_OPTIONS:
--storage-driver devicemapper

Change-Id: Ie86b7e70fdb996cdea950742a1cdb552a0db29e3
Closes-Bug: #1499219
This commit is contained in:
Eli Qiao 2015-09-24 16:42:40 +08:00
parent a9cc251e13
commit 59accc5e37
3 changed files with 21 additions and 0 deletions

View File

@ -0,0 +1,7 @@
#!/bin/sh
# This shell script will do some extra configure stuff before running services
echo "configuring swarm ..."
# Add --storage-driver devicemapper to DOCKER_STORAGE_OPTIONS
sed -i '/^DOCKER_STORAGE_OPTIONS=/ s/=.*/=--storage-driver devicemapper --storage-opt dm.fs=xfs --storage-opt dm.datadev=\/dev\/mapper\/atomicos-docker--data --storage-opt dm.metadatadev=\/dev\/mapper\/atomicos-docker--meta/' /etc/sysconfig/docker-storage

View File

@ -194,6 +194,12 @@ resources:
"$MAGNUM_URL": {get_param: magnum_url}
"$INSECURE": {get_param: insecure}
configure_swarm:
type: "OS::Heat::SoftwareConfig"
properties:
group: ungrouped
config: {get_file: fragments/configure-swarm.sh}
remove_docker_key:
type: "OS::Heat::SoftwareConfig"
properties:
@ -283,6 +289,7 @@ 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}

View File

@ -141,6 +141,12 @@ resources:
"$MAGNUM_URL": {get_param: magnum_url}
"$INSECURE": {get_param: insecure}
configure_swarm:
type: "OS::Heat::SoftwareConfig"
properties:
group: ungrouped
config: {get_file: fragments/configure-swarm.sh}
remove_docker_key:
type: "OS::Heat::SoftwareConfig"
properties:
@ -216,6 +222,7 @@ 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}