diff options
| author | rthallisey <rhallise@redhat.com> | 2015-08-28 18:10:55 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-09-18 15:19:06 -0400 |
| commit | a0bffb25810a634af5a7fde2d0cbb205813249de (patch) | |
| tree | 1db1bfa1305a23ac34470e32a4ff4229c5dcfe42 | |
| parent | 4b107aff5f46976ef1d5ba8ffd387e8f25091c55 (diff) | |
| download | kolla-a0bffb25810a634af5a7fde2d0cbb205813249de.tar.gz kolla-a0bffb25810a634af5a7fde2d0cbb205813249de.zip | |
Replace config-external with a JSON file for Rabbitmq
Change-Id: Ibb30af44a9362278eff012ff1145374788b06cd5
Partially-Implements: blueprint replace-config-external
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/config.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/start.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq.json.j2 | 17 | ||||
| -rwxr-xr-x | docker/rabbitmq/start.sh | 11 |
5 files changed, 29 insertions, 8 deletions
diff --git a/ansible/roles/rabbitmq/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml index 4f262e0d0..c008d8b6c 100644 --- a/ansible/roles/rabbitmq/tasks/bootstrap.yml +++ b/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/rabbitmq/:ro" + volumes: "{{ node_config_directory }}/rabbitmq/:/opt/kolla/config_files/:ro" volumes_from: - "rabbitmq_data" env: diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml index 21a5f90ca..740b3a230 100644 --- a/ansible/roles/rabbitmq/tasks/config.yml +++ b/ansible/roles/rabbitmq/tasks/config.yml @@ -14,3 +14,8 @@ dest: "{{ node_config_directory }}/rabbitmq/rabbitmq-env.conf" } - { src: "rabbitmq.config.j2", dest: "{{ node_config_directory }}/rabbitmq/rabbitmq.config" } + +- name: Copying Rabbitmq JSON configuration file + template: + src: "roles/rabbitmq/templates/rabbitmq.json.j2" + dest: "{{ node_config_directory }}/rabbitmq/config.json"
\ No newline at end of file diff --git a/ansible/roles/rabbitmq/tasks/start.yml b/ansible/roles/rabbitmq/tasks/start.yml index 72940111f..beb93f0d4 100644 --- a/ansible/roles/rabbitmq/tasks/start.yml +++ b/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/rabbitmq/:ro" + volumes: "{{ node_config_directory }}/rabbitmq/:/opt/kolla/config_files/:ro" volumes_from: - "rabbitmq_data" env: diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 new file mode 100644 index 000000000..dbf55c254 --- /dev/null +++ b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 @@ -0,0 +1,17 @@ +{ + "command": "/usr/sbin/rabbitmq-server", + "config_files": [ + { + "source": "/opt/kolla/config_files/rabbitmq-env.conf", + "dest": "/etc/rabbitmq/rabbitmq-env.conf", + "owner": "rabbitmq", + "perm": "0600" + }, + { + "source": "/opt/kolla/config_files/rabbitmq.config", + "dest": "/etc/rabbitmq/rabbitmq.config", + "owner": "rabbitmq", + "perm": "0600" + } + ] +} diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh index 749bee963..9e7108c3d 100755 --- a/docker/rabbitmq/start.sh +++ b/docker/rabbitmq/start.sh @@ -2,14 +2,12 @@ set -o errexit -CMD="/usr/sbin/rabbitmq-server" -ARGS="" - # loading common functions source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) # loading functions source /opt/kolla/config-rabbit.sh @@ -20,4 +18,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -$CMD $ARGS +echo "Running command: ${CMD}" +exec $CMD |