mirror of https://github.com/ceph/ceph-ansible.git
c90f605b51
Since Mimic the radosgw socket has two extra fields in the socket name (before the .asok suffix): <pid>.<ctid> Before: /var/run/ceph/ceph-client.rgw.cephaio-1.asok After: /var/run/ceph/ceph-client.rgw.cephaio-1.16913.23928832.asok The radosgw restart script doesn't handle this and could fail during an upgrade. If the SOCKETS variable isn't defined in the script then the test command won't fail because the return code is 0 $ test -S $ echo $? 0 There multiple issues in that script: - The default SOCKETS value isn't defined due to a typo SOCKET vs SOCKETS. - Because the socket name uses the pid then we need to check the socket name after the service restart. - After restarting the radosgw service we need to wait few seconds otherwise the socket won't be created. - Update the wget parameters because the command is doing a loop. We now use the same option than curl. - The check_rest function doesn't test the radosgw at all due to a wrong test command (test against a string) and always returns 0. This needs to use the DOCKER_EXECS variable in order to execute the command. $ test 'wget http://192.168.100.11:8080' $ echo $? 0 Also remove the test based on the ansible_fqdn because we only use the ansible_hostname + rgw instance name. Finally group all for loop into a single one. Resolves: #3926 Signed-off-by: Dimitri Savineau <dsavinea@redhat.com> |
||
|---|---|---|
| .github/ISSUE_TEMPLATE | ||
| contrib | ||
| docs | ||
| group_vars | ||
| infrastructure-playbooks | ||
| library | ||
| plugins | ||
| profiles | ||
| roles | ||
| tests | ||
| .gitignore | ||
| .mergify.yml | ||
| .travis.yml | ||
| CONTRIBUTING.md | ||
| LICENSE | ||
| Makefile | ||
| README-MULTISITE.md | ||
| README.rst | ||
| Vagrantfile | ||
| ansible.cfg | ||
| ceph-ansible.spec.in | ||
| dummy-ansible-hosts | ||
| generate_group_vars_sample.sh | ||
| raw_install_python.yml | ||
| requirements.txt | ||
| rhcs_edits.txt | ||
| site-container.yml.sample | ||
| site-docker.yml.sample | ||
| site.yml.sample | ||
| test.yml | ||
| tox-dashboard.ini | ||
| tox-podman.ini | ||
| tox-update.ini | ||
| tox.ini | ||
| vagrant_variables.yml.sample | ||
README.rst
ceph-ansible ============ Ansible playbooks for Ceph, the distributed filesystem. Please refer to our hosted documentation here: http://docs.ceph.com/ceph-ansible/master/ You can view documentation for our ``stable-*`` branches by substituting ``master`` in the link above for the name of the branch. For example: http://docs.ceph.com/ceph-ansible/stable-3.0/