Rename st2mistral vars & Misc cosmetic improvements #94
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
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,4 +1,8 @@ | ||
| # st2mistral version to install. Use latest `latest` to get automatic updates or pin it to numeric version like `2.1.1` | ||
| st2mistral_version: latest | ||
| # PostgreSQL DB name for Mistral. | ||
| st2mistral_db: mistral | ||
| # PostgreSQL DB user for Mistral. | ||
| st2mistral_db_username: mistral | ||
| # PostgreSQL DB password for Mistral. | ||
| st2mistral_db_password: StackStorm |
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,37 +1,26 @@ | ||
| --- | ||
| - name: Install st2python dependency for EL6 | ||
| become: yes | ||
| package: | ||
| name: st2python | ||
| state: present | ||
| when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "6" | ||
| tags: st2mistral | ||
|
|
||
| - name: Install latest st2mistral package | ||
| become: yes | ||
| package: | ||
| name: st2mistral | ||
| state: latest | ||
| when: st2mistral_version == "latest" | ||
| tags: [st2mistral, skip_ansible_lint] | ||
|
|
||
| - name: Install pinned st2mistral package | ||
| become: yes | ||
| package: | ||
| name: st2mistral={{ st2mistral_version }} | ||
| state: present | ||
| when: st2mistral_version != "latest" | ||
| tags: st2mistral | ||
|
|
||
| - name: Deploy database init script | ||
|
|
@@ -40,11 +29,9 @@ | |
| src: init_mistral_db.SQL.j2 | ||
| dest: /etc/mistral/init_mistral_db.SQL | ||
| register: mistral_deploy_database_init_script | ||
| tags: st2mistral | ||
|
|
||
| - name: Initiate mistral database | ||
| become: yes | ||
| become_user: postgres | ||
| shell: psql < /etc/mistral/init_mistral_db.SQL | ||
|
|
@@ -55,9 +42,29 @@ | |
| - restart mistral | ||
| tags: st2mistral | ||
|
|
||
| - name: Make sure "Initiate mistral database" doesn't run twice | ||
|
There was a problem hiding this comment. You're creating the file here, but I don't see where you're checking for the presence of the file in the previous task (i.e. no There was a problem hiding this comment. See: See: http://docs.ansible.com/ansible/shell_module.html for more info. |
||
| become: yes | ||
| file: | ||
| path: /etc/mistral/init_mistral_db.SQL.ansible.has.run | ||
| state: touch | ||
| when: mistral_initiate_database.changed | ||
| tags: st2mistral, skip_ansible_lint | ||
|
|
||
| - name: Configure mistral | ||
| become: yes | ||
| ini_file: | ||
| dest: /etc/mistral/mistral.conf | ||
| section: database | ||
| option: connection | ||
| value: postgresql://{{ st2mistral_db_username }}:{{ st2mistral_db_password }}@localhost/{{ st2mistral_db }} | ||
| backup: yes | ||
| notify: | ||
| - restart mistral | ||
| tags: st2mistral | ||
|
|
||
| - name: Setup mistral DB tables, etc | ||
|
There was a problem hiding this comment. Same as above - don't currently see how this is idempotent, since there is no There was a problem hiding this comment. Similar example with |
||
| become: yes | ||
| shell: /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head && touch /etc/mistral/mistral-db-manage.upgrade.head.ansible.has.run | ||
| args: | ||
| creates: /etc/mistral/mistral-db-manage.upgrade.head.ansible.has.run | ||
| register: setup_mistral_DB_tables | ||
|
|
@@ -67,11 +74,19 @@ | |
|
|
||
| - name: Register mistral actions | ||
| become: yes | ||
| shell: /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf populate && touch /etc/mistral/mistral-db-manage.populate.ansible.has.run | ||
|
There was a problem hiding this comment. We touch the file first, find: creates: /etc/mistral/mistral-db-manage.populate.ansible.has.run |
||
| args: | ||
| creates: /etc/mistral/mistral-db-manage.populate.ansible.has.run | ||
| register: register_mistral_actions | ||
| when: mistral_deploy_database_init_script.changed or mistral_initiate_database.changed or setup_mistral_DB_tables.changed | ||
| notify: | ||
| - restart mistral | ||
| tags: st2mistral, skip_ansible_lint | ||
|
|
||
| - name: Ensure mistral service is enabled and running | ||
| become: yes | ||
| service: | ||
| name: mistral | ||
| enabled: yes | ||
| state: started | ||
| tags: st2mistral | ||
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,2 +1,2 @@ | ||
| CREATE ROLE {{ st2mistral_db_username }} WITH CREATEDB LOGIN ENCRYPTED PASSWORD '{{ st2mistral_db_password }}'; | ||
| CREATE DATABASE {{ st2mistral_db }} OWNER {{ st2mistral_db_username }}; |
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.
Here we have a problem when user will consider to change any of
st2mistral_database settings in future, - theSQLscript will not run twice. That means, new DB is not created.We can workaround with additional lock files, but #95 should solve it in a right way.