Bring Kolla inline with FHS

This brings Kolla images inline with FHS and should make finding
locations of things more consistent and reliable with the linux world
at large.

Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8
Closes-Bug: #1485742

ansible/group_vars/all.yml

@@ -9,6 +9,7 @@ docker_api_version: "1.18"
 # to the fact that ansible will register a "change" if it has to create them
 # again. Persistent files allow for idempotency
 node_templates_directory: "/usr/share/kolla/templates"
+container_config_directory: "/var/lib/kolla/config_files"
 
 # The directory to store the config files on the destination node
 node_config_directory: "/etc/kolla"

ansible/roles/ceph/tasks/bootstrap_osds.yml

@@ -20,7 +20,7 @@
     name: "bootstrap_osd_{{ item.0 }}"
     image: "{{ ceph_osd_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/ceph-osd/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro"
       - "/dev/:/dev/"
     env:
       KOLLA_BOOTSTRAP:

ansible/roles/ceph/tasks/generate_cluster.yml

@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: ceph_mon
     image: "{{ ceph_mon_image_full }}"
-    volumes: "{{ node_config_directory }}/ceph-mon/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro"
     volumes_from:
       - "ceph_mon_data"
     env:

ansible/roles/ceph/tasks/start_mons.yml

@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: ceph_mon
     image: "{{ ceph_mon_image_full }}"
-    volumes: "{{ node_config_directory }}/ceph-mon/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro"
     volumes_from:
       - "ceph_mon_data"
     env:

ansible/roles/ceph/tasks/start_osds.yml

@@ -37,7 +37,7 @@
     image: "{{ ceph_osd_image_full }}"
     volumes:
       - "/var/lib/ceph/osd/{{ item.1.fs_uuid }}:/var/lib/ceph/osd/ceph-{{ item.0.stdout }}"
-      - "{{ node_config_directory }}/ceph-osd/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro"
       - "/dev/:/dev/"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/ceph/templates/ceph-mon.json.j2

@@ -2,27 +2,27 @@
     "command": "/usr/bin/ceph-mon -d -i {{ ansible_hostname }} --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:6789",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/ceph.conf",
+            "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "ceph",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.client.admin.keyring",
+            "source": "{{ container_config_directory }}/ceph.client.admin.keyring",
             "dest": "/etc/ceph/ceph.client.admin.keyring",
             "owner": "ceph",
             "perm": "0600",
             "optional": "True"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.client.mon.keyring",
+            "source": "{{ container_config_directory }}/ceph.client.mon.keyring",
             "dest": "/etc/ceph/ceph.client.mon.keyring",
             "owner": "ceph",
             "perm": "0600",
             "optional": "True"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.monmap",
+            "source": "{{ container_config_directory }}/ceph.monmap",
             "dest": "/etc/ceph/ceph.monmap",
             "owner": "ceph",
             "perm": "0600",

ansible/roles/ceph/templates/ceph-osd.json.j2

@@ -2,13 +2,13 @@
     "command": "/usr/bin/ceph-osd -f -d",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/ceph.conf",
+            "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "ceph",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.client.admin.keyring",
+            "source": "{{ container_config_directory }}/ceph.client.admin.keyring",
             "dest": "/etc/ceph/ceph.client.admin.keyring",
             "owner": "ceph",
             "perm": "0600"

ansible/roles/cinder/tasks/bootstrap.yml

@@ -57,7 +57,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_cinder
     image: "{{ cinder_api_image_full }}"
-    volumes: "{{ node_config_directory }}/cinder-api/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
     volumes_from:
      - cinder_data
     env:

ansible/roles/cinder/tasks/start.yml

@@ -13,7 +13,7 @@
     name: cinder_api
     image: "{{ cinder_api_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/cinder-api/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -34,7 +34,7 @@
     name: cinder_backup
     image: "{{ cinder_backup_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/cinder-backup/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -55,7 +55,7 @@
     name: cinder_scheduler
     image: "{{ cinder_scheduler_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/cinder-scheduler/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/cinder-scheduler/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -77,7 +77,7 @@
     name: cinder_volume
     image: "{{ cinder_volume_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/cinder-volume/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/cinder/templates/cinder-api.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/cinder.conf",
+            "source": "{{ container_config_directory }}/cinder.conf",
             "dest": "/etc/cinder/cinder.conf",
             "owner": "cinder",
             "perm": "0600"

ansible/roles/cinder/templates/cinder-backup.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/cinder.conf",
+            "source": "{{ container_config_directory }}/cinder.conf",
             "dest": "/etc/cinder/cinder.conf",
             "owner": "cinder",
             "perm": "0600"

ansible/roles/cinder/templates/cinder-scheduler.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/cinder.conf",
+            "source": "{{ container_config_directory }}/cinder.conf",
             "dest": "/etc/cinder/cinder.conf",
             "owner": "cinder",
             "perm": "0600"

ansible/roles/cinder/templates/cinder-volume.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/cinder.conf",
+            "source": "{{ container_config_directory }}/cinder.conf",
             "dest": "/etc/cinder/cinder.conf",
             "owner": "cinder",
             "perm": "0600"
         }{% if enable_ceph | bool %},
         {
-            "source": "/opt/kolla/config_files/ceph.client.cinder.keyring",
+            "source": "{{ container_config_directory }}/ceph.client.cinder.keyring",
             "dest": "/etc/ceph/ceph.client.cinder.keyring",
             "owner": "cinder",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.conf",
+            "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "cinder",
             "perm": "0600"

ansible/roles/common/tasks/start.yml

@@ -37,7 +37,7 @@
       - "log_data"
     volumes:
       - "/var/lib/kolla/dev:/dev"
-      - "{{ node_config_directory }}/rsyslog/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/rsyslog/:{{ container_config_directory }}/:ro"
     env:
         KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
 

ansible/roles/common/templates/rsyslog.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/sbin/rsyslogd -n",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/rsyslog.conf",
+            "source": "{{ container_config_directory }}/rsyslog.conf",
             "dest": "/etc/rsyslog.conf",
             "owner": "root",
             "perm": "0644"

ansible/roles/glance/tasks/bootstrap.yml

@@ -58,7 +58,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_glance
     image: "{{ glance_api_image_full }}"
-    volumes: "{{ node_config_directory }}/glance-api/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
     volumes_from:
      - glance_data
     env:

ansible/roles/glance/tasks/start.yml

@@ -14,7 +14,7 @@
     name: glance_registry
     image: "{{ glance_registry_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/glance-registry/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/glance-registry/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - glance_data
@@ -37,7 +37,7 @@
     name: glance_api
     image: "{{ glance_api_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/glance-api/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/glance/templates/glance-api.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/glance-api",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/glance-api.conf",
+            "source": "{{ container_config_directory }}/glance-api.conf",
             "dest": "/etc/glance/glance-api.conf",
             "owner": "glance",
             "perm": "0600"
         }{% if enable_ceph | bool %},
         {
-            "source": "/opt/kolla/config_files/ceph.client.glance.keyring",
+            "source": "{{ container_config_directory }}/ceph.client.glance.keyring",
             "dest": "/etc/ceph/ceph.client.glance.keyring",
             "owner": "glance",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.conf",
+            "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "glance",
             "perm": "0600"

ansible/roles/glance/templates/glance-registry.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/glance-registry",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/glance-registry.conf",
+            "source": "{{ container_config_directory }}/glance-registry.conf",
             "dest": "/etc/glance/glance-registry.conf",
             "owner": "glance",
             "perm": "0600"

ansible/roles/haproxy/tasks/start.yml

@@ -15,7 +15,7 @@
     image: "{{ keepalived_image_full }}"
     privileged: True
     volumes:
-      - "{{ node_config_directory }}/keepalived/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/keepalived/:{{ container_config_directory }}/:ro"
       - "/run:/run"
       - "/lib/modules:/lib/modules:ro"
     env:
@@ -37,13 +37,13 @@
     image: "{{ haproxy_image_full }}"
     privileged: True
     volumes:
-      - "{{ node_config_directory }}/haproxy/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro"
       - "/run:/run"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
 
 - name: Ensuring latest haproxy config is used
-  command: docker exec haproxy /opt/kolla/ensure_latest_config.sh
+  command: docker exec haproxy /usr/local/bin/kolla_ensure_haproxy_latest_config
   register: status
   changed_when: status.stdout.find('changed') != -1
 

ansible/roles/haproxy/templates/haproxy.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/haproxy.cfg",
+            "source": "{{ container_config_directory }}/haproxy.cfg",
             "dest": "/etc/haproxy/haproxy.cfg",
             "owner": "root",
             "perm": "0644"

ansible/roles/haproxy/templates/keepalived.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/sbin/keepalived -nld -p /run/keepalived.pid",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/keepalived.conf",
+            "source": "{{ container_config_directory }}/keepalived.conf",
             "dest": "/etc/keepalived/keepalived.conf",
             "owner": "root",
             "perm": "0644"

ansible/roles/heat/tasks/bootstrap.yml

@@ -41,7 +41,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_heat
     image: "{{ heat_api_image_full }}"
-    volumes: "{{ node_config_directory }}/heat-api/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/heat/tasks/start.yml

@@ -14,7 +14,7 @@
     name: heat_api
     image: "{{ heat_api_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/heat-api/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -35,7 +35,7 @@
     name: heat_api_cfn
     image: "{{ heat_api_cfn_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/heat-api-cfn/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/heat-api-cfn/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -56,7 +56,7 @@
     name: heat_engine
     image: "{{ heat_engine_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/heat-engine/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/heat-engine/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/heat/templates/heat-api-cfn.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/heat-api-cfn",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/heat.conf",
+            "source": "{{ container_config_directory }}/heat.conf",
             "dest": "/etc/heat/heat.conf",
             "owner": "heat",
             "perm": "0600"

ansible/roles/heat/templates/heat-api.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/heat-api",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/heat.conf",
+            "source": "{{ container_config_directory }}/heat.conf",
             "dest": "/etc/heat/heat.conf",
             "owner": "heat",
             "perm": "0600"

ansible/roles/heat/templates/heat-engine.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/heat-engine",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/heat.conf",
+            "source": "{{ container_config_directory }}/heat.conf",
             "dest": "/etc/heat/heat.conf",
             "owner": "heat",
             "perm": "0600"

ansible/roles/horizon/tasks/start.yml

@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: horizon
     image: "{{ horizon_image_full }}"
-    volumes: "{{ node_config_directory }}/horizon/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/horizon/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['horizon']

ansible/roles/horizon/templates/horizon.json.j2

@@ -5,13 +5,13 @@
     "command": "/usr/sbin/{{ apache_cmd }} -DFOREGROUND",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/horizon.conf",
+            "source": "{{ container_config_directory }}/horizon.conf",
             "dest": "/etc/{{ apache_dir }}/{{ apache_file }}",
             "owner": "horizon",
             "perm": "0644"
         },
         {
-            "source": "/opt/kolla/config_files/local_settings",
+            "source": "{{ container_config_directory }}/local_settings",
             "dest": "/etc/openstack-dashboard/local_settings",
             "owner": "horizon",
             "perm": "0644"

ansible/roles/ironic/tasks/bootstrap.yml

@@ -43,7 +43,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_ironic
     image: "{{ ironic_api_image_full }}"
-    volumes: "{{ node_config_directory }}/ironic-api/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/ironic/tasks/start.yml

@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: ironic-api
     image: "{{ ironic_api_image_full }}"
-    volumes: "{{ node_config_directory }}/ironic-api/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['ironic-api']
@@ -32,7 +32,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: ironic-conductor
     image: "{{ ironic_conductor_image_full }}"
-    volumes: "{{ node_config_directory }}/ironic-conductor/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['ironic-conductor']
@@ -52,7 +52,7 @@
     privileged: True
     name: ironic-discoverd
     image: "{{ ironic_discoverd_image_full }}"
-    volumes: "{{ node_config_directory }}/ironic-discoverd/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/ironic-discoverd/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['ironic-discoverd']
@@ -71,7 +71,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: ironic-pxe
     image: "{{ ironic_pxe_image_full }}"
-    volumes: "{{ node_config_directory }}/ironic-pxe/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['ironic-pxe']

ansible/roles/ironic/templates/ironic-api.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/ironic-api",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/ironic.conf",
+            "source": "{{ container_config_directory }}/ironic.conf",
             "dest": "/etc/ironic/ironic.conf",
             "owner": "ironic",
             "perm": "0600"

ansible/roles/ironic/templates/ironic-conductor.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/ironic-conductor",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/ironic.conf",
+            "source": "{{ container_config_directory }}/ironic.conf",
             "dest": "/etc/ironic/ironic.conf",
             "owner": "ironic",
             "perm": "0600"

ansible/roles/ironic/templates/ironic-discoverd.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/ironic-discoverd --config-file /etc/ironic-discoverd/discoverd.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/discoverd.conf",
+            "source": "{{ container_config_directory }}/discoverd.conf",
             "dest": "/etc/ironic-discoverd/discoverd.conf",
             "owner": "root",
             "perm": "0600"

ansible/roles/keystone/tasks/bootstrap.yml

@@ -43,7 +43,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_keystone
     image: "{{ keystone_image_full }}"
-    volumes: "{{ node_config_directory }}/keystone/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/keystone/tasks/start.yml

@@ -14,7 +14,7 @@
     name: keystone
     image: "{{ keystone_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/keystone/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/keystone/templates/keystone.json.j2

@@ -4,13 +4,13 @@
     "command": "/usr/sbin/{{ keystone_cmd }}",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/keystone.conf",
+            "source": "{{ container_config_directory }}/keystone.conf",
             "dest": "/etc/keystone/keystone.conf",
             "owner": "keystone",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/wsgi-keystone.conf",
+            "source": "{{ container_config_directory }}/wsgi-keystone.conf",
             "dest": "/etc/{{ keystone_dir }}/wsgi-keystone.conf",
             "owner": "keystone",
             "perm": "0644"

ansible/roles/mariadb/tasks/bootstrap.yml

@@ -66,7 +66,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: mariadb
     image: "{{ mariadb_image_full }}"
-    volumes: "{{ node_config_directory }}/mariadb/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro"
     volumes_from:
       - "mariadb_data"
     env:

ansible/roles/mariadb/tasks/start.yml

@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: mariadb
     image: "{{ mariadb_image_full }}"
-    volumes: "{{ node_config_directory }}/mariadb/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro"
     volumes_from:
       - "mariadb_data"
     env:

ansible/roles/mariadb/templates/mariadb.json.j2

@@ -3,7 +3,7 @@
     "command": "/usr/bin/mysqld_safe",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/galera.cnf",
+            "source": "{{ container_config_directory }}/galera.cnf",
             "dest": "/etc/{{ mysql_dir }}/galera.cnf",
             "owner": "mysql",
             "perm": "0600"

ansible/roles/memcached/tasks/start.yml

@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: memcached
     image: "{{ memcached_image_full }}"
-    volumes: "{{ node_config_directory }}/memcached/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/memcached/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['memcached']

ansible/roles/murano/tasks/bootstrap.yml

@@ -42,7 +42,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_murano
     image: "{{ murano_api_image_full }}"
-    volumes: "{{ node_config_directory }}/murano-api/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/murano/tasks/start.yml

@@ -14,7 +14,7 @@
     name: murano_engine
     image: "{{ murano_engine_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/murano-engine/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/murano-engine/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
     env:
@@ -36,7 +36,7 @@
     name: murano_api
     image: "{{ murano_api_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/murano-api/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/murano/templates/murano-api.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/murano-api --config-file /etc/murano/murano.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/murano.conf",
+            "source": "{{ container_config_directory }}/murano.conf",
             "dest": "/etc/murano/murano.conf",
             "owner": "murano",
             "perm": "0644"

ansible/roles/murano/templates/murano-engine.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/murano-engine --config-file /etc/murano/murano.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/murano.conf",
+            "source": "{{ container_config_directory }}/murano.conf",
             "dest": "/etc/murano/murano.conf",
             "owner": "murano",
             "perm": "0644"

ansible/roles/neutron/tasks/bootstrap.yml

@@ -41,7 +41,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_neutron
     image: "{{ neutron_server_image_full }}"
-    volumes: "{{ node_config_directory }}/neutron-server/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/neutron/tasks/start.yml

@@ -15,7 +15,7 @@
     image: "{{ openvswitch_db_image_full }}"
     volumes:
       - "/run:/run"
-      - "{{ node_config_directory }}/openvswitch-db-server/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
@@ -39,14 +39,14 @@
     volumes:
       - "/run:/run"
       - "/lib/modules:/lib/modules:ro"
-      - "{{ node_config_directory }}/openvswitch-vswitchd/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
         and neutron_plugin_agent == "openvswitch"
 
 - name: Ensuring OVS bridge is properly setup
-  command: docker exec openvswitch_vswitchd /opt/kolla/ovs_ensure_configured.sh {{ neutron_bridge_name }} {{ neutron_external_interface }}
+  command: docker exec openvswitch_vswitchd /usr/local/bin/kolla_ensure_openvswitch_configured {{ neutron_bridge_name }} {{ neutron_external_interface }}
   register: status
   changed_when: status.stdout.find('changed') != -1
   when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
@@ -67,7 +67,7 @@
     name: neutron_server
     image: "{{ neutron_server_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/neutron-server/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -91,7 +91,7 @@
     volumes:
       - "/run:/run"
       - "/lib/modules:/lib/modules:ro"
-      - "{{ node_config_directory }}/neutron-openvswitch-agent/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -116,7 +116,7 @@
     volumes:
       - "/run:/run"
       - "/lib/modules:/lib/modules:ro"
-      - "{{ node_config_directory }}/neutron-linuxbridge-agent/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -142,7 +142,7 @@
     image: "{{ neutron_agents_image_full }}"
     volumes:
       - "/run:/run"
-      - "{{ node_config_directory }}/neutron-agents/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/neutron-agents/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/neutron/templates/neutron-agents.json.j2

@@ -2,37 +2,37 @@
     "command": "",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/neutron.conf",
+            "source": "{{ container_config_directory }}/neutron.conf",
             "dest": "/etc/neutron/neutron.conf",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/dhcp_agent.ini",
+            "source": "{{ container_config_directory }}/dhcp_agent.ini",
             "dest": "/etc/neutron/dhcp_agent.ini",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/dnsmasq.conf",
+            "source": "{{ container_config_directory }}/dnsmasq.conf",
             "dest": "/etc/neutron/dnsmasq.conf",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/l3_agent.ini",
+            "source": "{{ container_config_directory }}/l3_agent.ini",
             "dest": "/etc/neutron/l3_agent.ini",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ml2_conf.ini",
+            "source": "{{ container_config_directory }}/ml2_conf.ini",
             "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/metadata_agent.ini",
+            "source": "{{ container_config_directory }}/metadata_agent.ini",
             "dest": "/etc/neutron/metadata_agent.ini",
             "owner": "neutron",
             "perm": "0600"

ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2

@@ -2,13 +2,13 @@
     "command": "/usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/neutron.conf",
+            "source": "{{ container_config_directory }}/neutron.conf",
             "dest": "/etc/neutron/neutron.conf",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ml2_conf.ini",
+            "source": "{{ container_config_directory }}/ml2_conf.ini",
             "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini",
             "owner": "neutron",
             "perm": "0600"

ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2

@@ -2,13 +2,13 @@
     "command": "/usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/neutron.conf",
+            "source": "{{ container_config_directory }}/neutron.conf",
             "dest": "/etc/neutron/neutron.conf",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ml2_conf.ini",
+            "source": "{{ container_config_directory }}/ml2_conf.ini",
             "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini",
             "owner": "neutron",
             "perm": "0600"

ansible/roles/neutron/templates/neutron-server.json.j2

@@ -2,13 +2,13 @@
     "command": "/usr/bin/neutron-server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/neutron.conf",
+            "source": "{{ container_config_directory }}/neutron.conf",
             "dest": "/etc/neutron/neutron.conf",
             "owner": "neutron",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ml2_conf.ini",
+            "source": "{{ container_config_directory }}/ml2_conf.ini",
             "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini",
             "owner": "neutron",
             "perm": "0600"

ansible/roles/nova/tasks/bootstrap.yml

@@ -59,7 +59,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: bootstrap_nova
     image: "{{ nova_api_image_full }}"
-    volumes: "{{ node_config_directory }}/nova-api/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

ansible/roles/nova/tasks/start.yml

@@ -16,7 +16,7 @@
     name: nova_libvirt
     image: "{{ nova_libvirt_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/nova-libvirt/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/nova-libvirt/:{{ container_config_directory }}/:ro"
       - "/run:/run"
       - "/sys/fs/cgroup:/sys/fs/cgroup"
       - "/lib/modules:/lib/modules:ro"
@@ -43,7 +43,7 @@
     image: "{{ nova_api_image_full }}"
     volumes:
       - "/var/lib/kolla/dev/log:/dev/log"
-      - "{{ node_config_directory }}/nova-api/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro"
       - "/lib/modules:/lib/modules:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -65,7 +65,7 @@
     image: "{{ nova_conductor_image_full }}"
     volumes:
       - "/var/lib/kolla/dev/log:/dev/log"
-      - "{{ node_config_directory }}/nova-conductor/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/nova-conductor/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['nova-conductor']
@@ -86,7 +86,7 @@
     image: "{{ nova_consoleauth_image_full }}"
     volumes:
       - "/var/lib/kolla/dev/log:/dev/log"
-      - "{{ node_config_directory }}/nova-consoleauth/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/nova-consoleauth/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['nova-consoleauth']
@@ -107,7 +107,7 @@
     image: "{{ nova_novncproxy_image_full }}"
     volumes:
       - "/var/lib/kolla/dev/log:/dev/log"
-      - "{{ node_config_directory }}/nova-novncproxy/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/nova-novncproxy/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['nova-novncproxy']
@@ -128,7 +128,7 @@
     image: "{{ nova_scheduler_image_full }}"
     volumes:
       - "/var/lib/kolla/dev/log:/dev/log"
-      - "{{ node_config_directory }}/nova-scheduler/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/nova-scheduler/:{{ container_config_directory }}/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['nova-scheduler']
@@ -149,7 +149,7 @@
     name: nova_compute
     image: "{{ nova_compute_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/nova-compute/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
       - "/lib/modules:/lib/modules:ro"
       - "/run:/run"
       - "/var/lib/kolla/dev/log:/dev/log"

ansible/roles/nova/templates/nova-api.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/nova-api",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/nova.conf",
+            "source": "{{ container_config_directory }}/nova.conf",
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"

ansible/roles/nova/templates/nova-compute.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/nova-compute",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/nova.conf",
+            "source": "{{ container_config_directory }}/nova.conf",
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"
         }{% if enable_ceph | bool %},
         {
-            "source": "/opt/kolla/config_files/ceph.client.nova.keyring",
+            "source": "{{ container_config_directory }}/ceph.client.nova.keyring",
             "dest": "/etc/ceph/ceph.client.nova.keyring",
             "owner": "nova",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.conf",
+            "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "nova",
             "perm": "0600"

ansible/roles/nova/templates/nova-conductor.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/nova-conductor",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/nova.conf",
+            "source": "{{ container_config_directory }}/nova.conf",
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"

ansible/roles/nova/templates/nova-consoleauth.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/nova-consoleauth",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/nova.conf",
+            "source": "{{ container_config_directory }}/nova.conf",
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"

ansible/roles/nova/templates/nova-libvirt.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/sbin/libvirtd --listen",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/libvirtd.conf",
+            "source": "{{ container_config_directory }}/libvirtd.conf",
             "dest": "/etc/libvirt/libvirtd.conf",
             "owner": "root",
             "perm": "0644"
         }{% if enable_ceph | bool %},
         {
-            "source": "/opt/kolla/config_files/secrets",
+            "source": "{{ container_config_directory }}/secrets",
             "dest": "/etc/libvirt/secrets",
             "owner": "root",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/ceph.conf",
+            "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "root",
             "perm": "0600"

ansible/roles/nova/templates/nova-network.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/nova-network",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/nova.conf",
+            "source": "{{ container_config_directory }}/nova.conf",
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"

ansible/roles/nova/templates/nova-novncproxy.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/nova-novncproxy",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/nova.conf",
+            "source": "{{ container_config_directory }}/nova.conf",
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"

ansible/roles/nova/templates/nova-scheduler.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/nova-scheduler",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/nova.conf",
+            "source": "{{ container_config_directory }}/nova.conf",
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"

ansible/roles/rabbitmq/tasks/bootstrap.yml

@@ -37,7 +37,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: rabbitmq_bootstrap
     image: "{{ rabbitmq_image_full }}"
-    volumes: "{{ node_config_directory }}/rabbitmq/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"
     volumes_from:
       - "rabbitmq_data"
     env:

ansible/roles/rabbitmq/tasks/start.yml

@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: rabbitmq
     image: "{{ rabbitmq_image_full }}"
-    volumes: "{{ node_config_directory }}/rabbitmq/:/opt/kolla/config_files/:ro"
+    volumes: "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"
     volumes_from:
       - "rabbitmq_data"
     env:

ansible/roles/rabbitmq/templates/rabbitmq.json.j2

@@ -2,13 +2,13 @@
     "command": "/usr/sbin/rabbitmq-server",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/rabbitmq-env.conf",
+            "source": "{{ container_config_directory }}/rabbitmq-env.conf",
             "dest": "/etc/rabbitmq/rabbitmq-env.conf",
             "owner": "rabbitmq",
             "perm": "0600"
         },
         {
-            "source": "/opt/kolla/config_files/rabbitmq.config",
+            "source": "{{ container_config_directory }}/rabbitmq.config",
             "dest": "/etc/rabbitmq/rabbitmq.config",
             "owner": "rabbitmq",
             "perm": "0600"

ansible/roles/swift/tasks/start.yml

@@ -14,7 +14,7 @@
     name: swift_rsyncd
     image: "{{ swift_rsyncd_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift-rsyncd/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-rsyncd/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -36,8 +36,8 @@
     name: swift_proxy_server
     image: "{{ swift_proxy_server_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-proxy-server/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-proxy-server/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -60,8 +60,8 @@
     name: swift_account_server
     image: "{{ swift_account_server_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-server/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-account-server/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -84,8 +84,8 @@
     name: swift_account_auditor
     image: "{{ swift_account_auditor_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-auditor/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-account-auditor/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -108,8 +108,8 @@
     name: swift_account_replicator
     image: "{{ swift_account_replicator_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-replicator/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-account-replicator/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -132,8 +132,8 @@
     name: swift_account_reaper
     image: "{{ swift_account_reaper_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-account-reaper/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-account-reaper/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -156,8 +156,8 @@
     name: swift_container_server
     image: "{{ swift_container_server_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-server/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-container-server/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -180,8 +180,8 @@
     name: swift_container_auditor
     image: "{{ swift_container_auditor_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-auditor/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-container-auditor/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -204,8 +204,8 @@
     name: swift_container_replicator
     image: "{{ swift_container_replicator_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-replicator/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-container-replicator/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -228,8 +228,8 @@
     name: swift_container_updater
     image: "{{ swift_container_updater_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-container-updater/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-container-updater/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -252,8 +252,8 @@
     name: swift_object_server
     image: "{{ swift_object_server_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-server/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-object-server/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -276,8 +276,8 @@
     name: swift_object_auditor
     image: "{{ swift_object_auditor_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-auditor/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-object-auditor/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -300,8 +300,8 @@
     name: swift_object_replicator
     image: "{{ swift_object_replicator_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-replicator/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-object-replicator/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -324,8 +324,8 @@
     name: swift_object_updater
     image: "{{ swift_object_updater_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-updater/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-object-updater/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data
@@ -348,8 +348,8 @@
     name: swift_object_expirer
     image: "{{ swift_object_expirer_image_full }}"
     volumes:
-      - "{{ node_config_directory }}/swift/:/opt/kolla/swift/:ro"
+      - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro"
-      - "{{ node_config_directory }}/swift-object-expirer/:/opt/kolla/config_files/:ro"
+      - "{{ node_config_directory }}/swift-object-expirer/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
     volumes_from:
       - swift_data

ansible/roles/swift/templates/swift-account-auditor.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/swift-account-auditor /etc/swift/account-auditor.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account.ring.gz",
+            "source": "{{ container_config_directory }}/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account-auditor.conf",
+            "source": "{{ container_config_directory }}/account-auditor.conf",
             "dest": "/etc/swift/account-auditor.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-account-reaper.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/swift-account-reaper /etc/swift/account-reaper.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account.ring.gz",
+            "source": "{{ container_config_directory }}/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account-reaper.conf",
+            "source": "{{ container_config_directory }}/account-reaper.conf",
             "dest": "/etc/swift/account-reaper.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-account-replicator.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/swift-account-replicator /etc/swift/account-replicator.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account.ring.gz",
+            "source": "{{ container_config_directory }}/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account-replicator.conf",
+            "source": "{{ container_config_directory }}/account-replicator.conf",
             "dest": "/etc/swift/account-replicator.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-account-server.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/swift-account-server /etc/swift/account-server.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account.ring.gz",
+            "source": "{{ container_config_directory }}/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account-server.conf",
+            "source": "{{ container_config_directory }}/account-server.conf",
             "dest": "/etc/swift/account-server.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-container-auditor.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/swift-container-auditor /etc/swift/container-auditor.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container-auditor.conf",
+            "source": "{{ container_config_directory }}/container-auditor.conf",
             "dest": "/etc/swift/container-auditor.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-container-replicator.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/swift-container-replicator /etc/swift/container-replicator.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container-replicator.conf",
+            "source": "{{ container_config_directory }}/container-replicator.conf",
             "dest": "/etc/swift/container-replicator.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-container-server.json.j2

@@ -2,19 +2,19 @@
     "command": "/usr/bin/swift-container-server /etc/swift/container-server.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container-server.conf",
+            "source": "{{ container_config_directory }}/container-server.conf",
             "dest": "/etc/swift/container-server.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-container-updater.json.j2

@@ -2,25 +2,25 @@
     "command": "/usr/bin/swift-container-updater /etc/swift/container-updater.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account.ring.gz",
+            "source": "{{ container_config_directory }}/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container-updater.conf",
+            "source": "{{ container_config_directory }}/container-updater.conf",
             "dest": "/etc/swift/container-updater.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-object-auditor.json.j2

@@ -2,25 +2,25 @@
     "command": "/usr/bin/swift-object-auditor /etc/swift/object-auditor.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object.ring.gz",
+            "source": "{{ container_config_directory }}/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object-auditor.conf",
+            "source": "{{ container_config_directory }}/object-auditor.conf",
             "dest": "/etc/swift/object-auditor.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-object-expirer.json.j2

@@ -2,31 +2,31 @@
     "command": "/usr/bin/swift-object-expirer /etc/swift/object-expirer.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account.ring.gz",
+            "source": "{{ container_config_directory }}/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object.ring.gz",
+            "source": "{{ container_config_directory }}/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object-expirer.conf",
+            "source": "{{ container_config_directory }}/object-expirer.conf",
             "dest": "/etc/swift/object-expirer.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-object-replicator.json.j2

@@ -2,25 +2,25 @@
     "command": "/usr/bin/swift-object-replicator /etc/swift/object-replicator.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object.ring.gz",
+            "source": "{{ container_config_directory }}/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object-replicator.conf",
+            "source": "{{ container_config_directory }}/object-replicator.conf",
             "dest": "/etc/swift/object-replicator.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-object-server.json.j2

@@ -2,25 +2,25 @@
     "command": "/usr/bin/swift-object-server /etc/swift/object-server.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object.ring.gz",
+            "source": "{{ container_config_directory }}/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object-server.conf",
+            "source": "{{ container_config_directory }}/object-server.conf",
             "dest": "/etc/swift/object-server.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-object-updater.json.j2

@@ -2,25 +2,25 @@
     "command": "/usr/bin/swift-object-updater /etc/swift/object-updater.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object.ring.gz",
+            "source": "{{ container_config_directory }}/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object-updater.conf",
+            "source": "{{ container_config_directory }}/object-updater.conf",
             "dest": "/etc/swift/object-updater.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-proxy-server.json.j2

@@ -2,31 +2,31 @@
     "command": "/usr/bin/swift-proxy-server /etc/swift/proxy-server.conf --verbose",
     "config_files": [
         {
-            "source": "/opt/kolla/swift/swift.conf",
+            "source": "/var/lib/kolla/swift/swift.conf",
             "dest": "/etc/swift/swift.conf",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/account.ring.gz",
+            "source": "{{ container_config_directory }}/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/container.ring.gz",
+            "source": "{{ container_config_directory }}/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/object.ring.gz",
+            "source": "{{ container_config_directory }}/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "/opt/kolla/config_files/proxy-server.conf",
+            "source": "{{ container_config_directory }}/proxy-server.conf",
             "dest": "/etc/swift/proxy-server.conf",
             "owner": "swift",
             "perm": "0640"

ansible/roles/swift/templates/swift-rsyncd.json.j2

@@ -2,7 +2,7 @@
     "command": "/usr/bin/rsync --daemon --no-detach --config=/etc/rsyncd.conf",
     "config_files": [
         {
-            "source": "/opt/kolla/config_files/rsyncd.conf",
+            "source": "{{ container_config_directory }}/rsyncd.conf",
             "dest": "/etc/rsyncd.conf",
             "owner": "swift",
             "perm": "0640"

docker/base/Dockerfile.j2

@@ -188,10 +188,9 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD
 
 {% endif %}
 
-COPY set_configs.py /opt/kolla/
+COPY set_configs.py /usr/local/bin/kolla_set_configs
-
 COPY start.sh /usr/local/bin/kolla_start
 RUN touch /usr/local/bin/kolla_extend_start \
-    && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /opt/kolla/set_configs.py
+    && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs
 
 CMD ["kolla_start"]

docker/base/set_configs.py

@@ -140,7 +140,7 @@ def set_permissions(data):
 
 
 def load_config():
-    config_file = '/opt/kolla/config_files/config.json'
+    config_file = '/var/lib/kolla/config_files/config.json'
     LOG.info('Loading config file at {}'.format(config_file))
 
     # Attempt to read config file

docker/base/start.sh

@@ -2,7 +2,7 @@
 set -o errexit
 
 # Processing /opt/kolla/config_files/config.json
-python /opt/kolla/set_configs.py
+python /usr/local/bin/kolla_set_configs
 CMD=$(cat /run_command)
 ARGS=""
 

docker/ceilometer/ceilometer-alarm/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 

docker/ceilometer/ceilometer-api/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 

docker/ceilometer/ceilometer-central/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 

docker/ceilometer/ceilometer-collector/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 

docker/ceilometer/ceilometer-compute/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 

docker/ceilometer/ceilometer-notification/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 

docker/designate/designate-api/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 

docker/designate/designate-backend-bind9/Dockerfile.j2

@@ -6,7 +6,8 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
 
 RUN yum install -y bind \
     && yum clean all \
-    && cp -pr /var/named /opt/kolla/var-named
+    && mkdir -p /var/lib/kolla/ \
+    && cp -pr /var/named /var/lib/kolla/var-named
 
     {% endif %}
 {% endif %}

docker/designate/designate-backend-bind9/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 

docker/designate/designate-central/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 

docker/designate/designate-mdns/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 

docker/designate/designate-poolmanager/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 

docker/designate/designate-sink/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 

docker/gnocchi/gnocchi-api/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
+SOURCE="/var/lib/kolla/gnocchi-api/gnocchi-api.conf"
 TARGET="/etc/gnocchi/gnocchi-api.conf"
 OWNER="gnocchi"
 

docker/gnocchi/gnocchi-statsd/config-external.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
+SOURCE="/var/lib/kolla/gnocchi-api/gnocchi-api.conf"
 TARGET="/etc/gnocchi/gnocchi-api.conf"
 OWNER="gnocchi"
 

docker/haproxy/Dockerfile.j2

@@ -3,8 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install \
+RUN yum -y install haproxy \
-        haproxy \
     && yum clean all
 
 {% elif base_distro == 'ubuntu' %}
@@ -19,9 +18,8 @@ RUN apt-get install -y --no-install-recommends haproxy \
 
 {% endif %}
 
-COPY ensure_latest_config.sh /opt/kolla/
+COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start /opt/kolla/ensure_latest_config.sh
+RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_haproxy_latest_config
 
 {{ include_footer }}

docker/haproxy/ensure_latest_config.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 CURRENT_CONFIG_HASH=$(sha1sum /etc/haproxy/haproxy.cfg | cut -f1 -d' ')
-NEW_CONFIG_HASH=$(sha1sum /opt/kolla/config_files/haproxy.cfg | cut -f1 -d' ')
+NEW_CONFIG_HASH=$(sha1sum /var/lib/kolla/config_files/haproxy.cfg | cut -f1 -d' ')
 
 if [[ $CURRENT_CONFIG_HASH != $NEW_CONFIG_HASH ]]; then
     changed=changed
-    source /opt/kolla/config-external.sh
+    python /usr/local/bin/kolla_set_configs
     /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -sf $(cat /run/haproxy.pid)
 fi