diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-04 23:29:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-04 23:29:13 +0000 |
| commit | ac03bcfffef5a83df4a458cbc92117ada6cf7301 (patch) | |
| tree | d0de725800b3a5c45d4d321270806cfd7a4ad02f /docker/services/nova-conductor.yaml | |
| parent | 1b09a3d6e295f602c118c6656d1abce8614f915c (diff) | |
| parent | 91e7a548cb4e39e72798c8cda16f3a946128a419 (diff) | |
Merge "Remove kolla_config copy from services"
Diffstat (limited to 'docker/services/nova-conductor.yaml')
| -rw-r--r-- | docker/services/nova-conductor.yaml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index f85cf546..b7a1d742 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -60,13 +60,8 @@ outputs: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ] kolla_config: - /var/lib/kolla/config_files/nova_conductor.json: - command: /usr/bin/nova-conductor - config_files: - - dest: /etc/nova/nova.conf - owner: nova - perm: '0600' - source: /var/lib/kolla/config_files/src/etc/nova/nova.conf + /var/lib/kolla/config_files/nova_conductor.json: + command: /usr/bin/nova-conductor docker_config: step_4: nova_conductor: @@ -78,11 +73,11 @@ outputs: privileged: false restart: always volumes: - - /run:/run - /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/nova/:/var/lib/kolla/config_files/src:ro + - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro - /etc/hosts:/etc/hosts:ro - /etc/localtime:/etc/localtime:ro + - /run:/run environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS upgrade_tasks: |