diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-01 07:43:18 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-06 03:30:53 +0000 |
| commit | 94162bd08f40ec742a7bfcdcd4aac45be5bd5618 (patch) | |
| tree | 4a0027d671f3e14449663c29d6c95dc0dbe0cee0 /ansible/roles/haproxy | |
| parent | cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c (diff) | |
| download | kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.tar.gz kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.zip | |
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
Diffstat (limited to 'ansible/roles/haproxy')
| -rwxr-xr-x | ansible/roles/haproxy/tasks/start.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.json.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/haproxy/templates/keepalived.json.j2 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ansible/roles/haproxy/tasks/start.yml b/ansible/roles/haproxy/tasks/start.yml index 84a545d2b..5e569e357 100755 --- a/ansible/roles/haproxy/tasks/start.yml +++ b/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 diff --git a/ansible/roles/haproxy/templates/haproxy.json.j2 b/ansible/roles/haproxy/templates/haproxy.json.j2 index 62a30b3dd..a14bb1a37 100644 --- a/ansible/roles/haproxy/templates/haproxy.json.j2 +++ b/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" diff --git a/ansible/roles/haproxy/templates/keepalived.json.j2 b/ansible/roles/haproxy/templates/keepalived.json.j2 index 27ebf7c96..63a760c67 100644 --- a/ansible/roles/haproxy/templates/keepalived.json.j2 +++ b/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" |