This repository has been archived by the owner on Dec 7, 2022. It is now read-only.
Switches dev env to qpid #108
Merged
bmbouter
merged 1 commit into
pulp:3.0-dev
from
bmbouter:enable-amqp-1-0-pulp3-dev-only
Jan 19, 2018
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Switches dev env to qpid
Adds a new role called kombu_fixup which provides a source install of qpid-tools and kombu. Also adds a commented example line to switch the environment back to rabbitmq. See the change in Vagrantfile.example. I tested the resulting environment against the pulp_file sync commands, and it ran as expected with both brokers. closes #2259
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,3 +94,6 @@ Vagrantfile* | |
| .vagrant | ||
| .dnf-cache | ||
| ansible/*.retry | ||
|
|
||
| # PyCharm | ||
| .idea/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,23 @@ | ||
| - name: Install packages | ||
| - name: Install Qpid packages | ||
| package: name={{ item }} state=present | ||
| with_items: | ||
| - qpid-cpp-server | ||
| when: use_rabbitmq == False | ||
|
|
||
| - name: Start and enable Qpid services | ||
| service: name={{ item }} state=started enabled=yes | ||
| with_items: | ||
| - qpidd | ||
| when: use_rabbitmq == False | ||
|
|
||
| - name: Install rabbitmq packages | ||
| package: name={{ item }} state=present | ||
| with_items: | ||
| - rabbitmq-server | ||
| when: use_rabbitmq == True | ||
|
|
||
| - name: Start and enable services | ||
| - name: Start and enable rabbitmq services | ||
| service: name={{ item }} state=started enabled=yes | ||
| with_items: | ||
| - rabbitmq-server | ||
| when: use_rabbitmq == True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| - name: "Uninstall the Kombu we received from PyPI" | ||
| pip: | ||
| state: absent | ||
| name: kombu | ||
| virtualenv: "{{ pulp_venv }}" | ||
| virtualenv_command: /usr/bin/python3 -m venv | ||
|
|
||
| - name: "Install kombu from source" | ||
| pip: | ||
| name: "git+https://github.com/bmbouter/kombu.git@624-convert-qpid-to-amqp-1.0#egg=kombu" | ||
| extra_args: "-e" | ||
| virtualenv: "{{ pulp_venv }}" | ||
| virtualenv_command: /usr/bin/python3 -m venv | ||
|
|
||
| - name: "Install system packages proton needs" | ||
| package: name={{ item }} state=present | ||
| with_items: | ||
| - qpid-tools # on system to provide 'qpid-stat' command | ||
| - python-qpid-proton # a required dependency of kombu | ||
| - python3-devel # allows for compilation during pip installs | ||
| - gcc # allows for compilation during pip installs | ||
|
|
||
| - name: "clone the patched qpid-tools" | ||
| git: | ||
| repo: 'https://github.com/bmbouter/qpid-cpp' | ||
| dest: /tmp/qpid-cpp | ||
| version: qpid-for-pulp | ||
|
|
||
| - name: "Install qpid-tools from source" | ||
| command: "{{ pulp_venv }}/bin/python3 setup.py install" | ||
| args: | ||
| chdir: "/tmp/qpid-cpp/management/python" | ||
|
|
||
| - name: "Install python-qpid-proton from PyPI" | ||
| pip: | ||
| name: "python-qpid-proton" | ||
| virtualenv: "{{ pulp_venv }}" | ||
| virtualenv_command: /usr/bin/python3 -m venv |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
vim > pycharm 😄