Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Sort ResourceGroup resource list"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
swift-storage.yaml
diff --git
a/docker/services/swift-storage.yaml
b/docker/services/swift-storage.yaml
index
1b89827
..
301ef69
100644
(file)
--- a/
docker/services/swift-storage.yaml
+++ b/
docker/services/swift-storage.yaml
@@
-104,9
+104,9
@@
outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
user: root
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
user: root
- command: ['
/bin/bash', '-c', 'mkdir /srv/node && chown swift:swift
/srv/node']
+ command: ['
chown', '-R', 'swift:', '
/srv/node']
volumes:
volumes:
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
step_4:
swift_account_auditor:
image: *swift_account_image
step_4:
swift_account_auditor:
image: *swift_account_image
@@
-120,7
+120,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: &kolla_env
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
- /dev:/dev
environment: &kolla_env
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
@@
-136,7
+136,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_account_replicator:
- /dev:/dev
environment: *kolla_env
swift_account_replicator:
@@
-151,7
+151,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_account_server:
- /dev:/dev
environment: *kolla_env
swift_account_server:
@@
-166,7
+166,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_auditor:
- /dev:/dev
environment: *kolla_env
swift_container_auditor:
@@
-184,7
+184,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_replicator:
- /dev:/dev
environment: *kolla_env
swift_container_replicator:
@@
-199,7
+199,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_updater:
- /dev:/dev
environment: *kolla_env
swift_container_updater:
@@
-214,7
+214,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_server:
- /dev:/dev
environment: *kolla_env
swift_container_server:
@@
-229,7
+229,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_auditor:
- /dev:/dev
environment: *kolla_env
swift_object_auditor:
@@
-247,7
+247,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_expirer:
- /dev:/dev
environment: *kolla_env
swift_object_expirer:
@@
-262,7
+262,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_replicator:
- /dev:/dev
environment: *kolla_env
swift_object_replicator:
@@
-277,7
+277,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_updater:
- /dev:/dev
environment: *kolla_env
swift_object_updater:
@@
-292,7
+292,7
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_server:
- /dev:/dev
environment: *kolla_env
swift_object_server:
@@
-307,9
+307,14
@@
outputs:
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- -
swift-srv:/srv
+ -
/srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
- /dev:/dev
environment: *kolla_env
+ host_prep_tasks:
+ - name: create /srv/node
+ file:
+ path: /srv/node
+ state: directory
upgrade_tasks:
- name: Stop and disable swift storage services
tags: step2
upgrade_tasks:
- name: Stop and disable swift storage services
tags: step2