diff --git a/tasks/tacker_db_setup.yml b/tasks/tacker_db_setup.yml index 7bb829d..3aa35d1 100644 --- a/tasks/tacker_db_setup.yml +++ b/tasks/tacker_db_setup.yml @@ -13,32 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Create DB for service - mysql_db: - login_user: "{{ galera_root_user }}" - login_password: "{{ galera_root_password }}" - login_host: "{{ tacker_galera_address }}" - name: "{{ tacker_galera_database }}" - state: "present" - tags: - - tacker-db-setup - -- name: Grant access to the DB for the service - mysql_user: - login_user: "{{ galera_root_user }}" - login_password: "{{ galera_root_password }}" - login_host: "{{ tacker_galera_address }}" - name: "{{ tacker_galera_user }}" - password: "{{ tacker_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ tacker_galera_database }}.*:ALL" - with_items: - - "localhost" - - "%" - tags: - - tacker-db-setup - - name: Perform a tacker DB sync command: "{{ tacker_bin }}/tacker-db-manage --config-file {{ tacker_etc_dir }}/tacker.conf upgrade head" @@ -48,4 +22,3 @@ - tacker-db-sync - tacker-setup - tacker-command-bin - diff --git a/tasks/tacker_install.yml b/tasks/tacker_install.yml index 04553a4..988c268 100644 --- a/tasks/tacker_install.yml +++ b/tasks/tacker_install.yml @@ -75,28 +75,17 @@ return_content: True when: - not tacker_developer_mode | bool - register: remote_venv_checksum + register: tacker_venv_checksum -# TODO: When project moves to ansible 2 we can pass this a sha256sum which will: -# a) allow us to remove force: yes -# b) allow the module to calculate the checksum of dest file which would -# result in file being downloaded only if provided and dest sha256sum -# checksums differ - name: Attempt venv download get_url: url: "{{ tacker_venv_download_url }}" dest: "/var/cache/{{ tacker_venv_download_url | basename }}" - force: yes + checksum: "sha1:{{ tacker_venv_checksum.content | trim }}" ignore_errors: true - register: get_venv + register: tacker_get_venv when: - not tacker_developer_mode | bool - - (local_venv_stat.stat.exists == False or - {{ local_venv_stat.stat.checksum is defined and local_venv_stat.stat.checksum != remote_venv_checksum.content | trim }}) - -- name: Set tacker get_venv fact - set_fact: - tacker_get_venv: "{{ get_venv }}" - name: Remove existing venv file: