aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-01 17:20:06 +0000
committerGerrit Code Review <review@openstack.org>2017-08-01 17:20:06 +0000
commit24349715ca7f05450d2d2da5c29fb76d44fd52aa (patch)
treeb9be3ce2dccd4644d5a8d09109533b8b0022c8f8
parent960b9802016a89bd1fa007a1d2a5d703d168fccd (diff)
parente3ee5965fd1dab46fc9054e5b2b48adfea6e5304 (diff)
Merge "Add missing metadata_settings from docker services"
-rw-r--r--docker/services/cinder-api.yaml2
-rw-r--r--docker/services/nova-api.yaml2
-rw-r--r--docker/services/nova-placement.yaml2
3 files changed, 6 insertions, 0 deletions
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 7804fdb2..58dec1a0 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -166,6 +166,8 @@ outputs:
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+ metadata_settings:
+ get_attr: [CinderBase, role_data, metadata_settings]
host_prep_tasks:
- name: create persistent logs directory
file:
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 4bec8035..e830ab96 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -195,6 +195,8 @@ outputs:
volumes: *nova_api_bootstrap_volumes
user: root
command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage cell_v2 discover_hosts'"
+ metadata_settings:
+ get_attr: [NovaApiBase, role_data, metadata_settings]
host_prep_tasks:
- name: create persistent logs directory
file:
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 7350db20..4c8fafd0 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -100,6 +100,8 @@ outputs:
- /var/log/containers/nova:/var/log/nova
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+ metadata_settings:
+ get_attr: [NovaPlacementBase, role_data, metadata_settings]
host_prep_tasks:
- name: create persistent logs directory
file: