diff --git a/defaults/main.yml b/defaults/main.yml index f291849..86b722e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -65,14 +65,14 @@ con_mounts_default: - "{{ con_disk_path }}:/vol/" - "{{ (con_metrics_disk_path == None)|ternary('', con_metrics_disk_path ~ ':/vol_metrics/') }}" - "{{ (con_logs_disk_path == None)|ternary('', con_logs_disk_path ~ ':/vol_logs/') }}" -con_mounts_all: "{{ con_mounts_extras + con_mounts_default}}" +con_mounts_all: "{{ con_mounts_extras + con_mounts_default }}" con_mounts_string: "{% for mount_var in con_mounts_all|reject('match', '^$') %} -v {{ mount_var }}{% endfor %}" # Environment variables which are sent to the docker container, these are used in the service templates. con_env_variables_extras: [] con_env_variables_default: - "CONTAINER_NAME=avicontroller" - - "MANAGEMENT_IP={{ con_controller_ip|string}}" + - "MANAGEMENT_IP={{ con_controller_ip|string }}" - "NUM_CPU={{ con_cores }}" - "NUM_MEMG={{ con_memory_gb }}" - "DISK_GB={{ con_disk_gb }}" diff --git a/tasks/docker/con_requirements.yml b/tasks/docker/con_requirements.yml index f393bb3..739778e 100644 --- a/tasks/docker/con_requirements.yml +++ b/tasks/docker/con_requirements.yml @@ -32,11 +32,16 @@ - name: Avi Controller | Requirements | Set max_cores and memory limits of environment set_fact: - con_max_cores: "{{ ansible_processor_cores * ansible_processor_count * ansible_processor_threads_per_core}}" + con_max_cores: "{{ ansible_processor_cores * ansible_processor_count * ansible_processor_threads_per_core }}" con_ansible_memtotal_gb: "{{ ansible_memtotal_mb // 1024 }}" - name: Avi Controller | Requirements | Get Ansible processor info - debug: msg="con_max_cores {{con_max_cores}} ansible processor cores {{ ansible_processor_cores }} count {{ansible_processor_count}} threads {{ansible_processor_threads_per_core}}" + debug: + msg: >- + con_max_cores {{ con_max_cores }} + ansible processor cores {{ ansible_processor_cores }} + count {{ ansible_processor_count }} + threads {{ ansible_processor_threads_per_core }} when: not con_skip_requirements - name: Avi Controller | Requirements | Validate Parameters diff --git a/tasks/docker/custom_repo.yml b/tasks/docker/custom_repo.yml index 6e6d03e..015e49f 100644 --- a/tasks/docker/custom_repo.yml +++ b/tasks/docker/custom_repo.yml @@ -4,7 +4,7 @@ # - block: - name: Avi Controller | Docker | Log into the custom docker repository - shell: "docker login -u {{ con_docker_repo_user }} -p {{ con_docker_repo_password}} {{ con_docker_repo }}" + shell: "docker login -u {{ con_docker_repo_user }} -p {{ con_docker_repo_password }} {{ con_docker_repo }}" register: con_docker_repo_login when: - con_docker_repo_user != None @@ -14,4 +14,4 @@ register: con_load_docker_repo changed_when: "'Status: Image is up to date' not in con_load_docker_repo.stdout" notify: Avi Controller | Services | Restart the avicontroller service - when: con_docker_match.stdout == "" or con_version == "latest" + when: not con_docker_match.stdout or con_version == "latest" diff --git a/tasks/docker/main.yml b/tasks/docker/main.yml index 0f2b904..b9056a3 100644 --- a/tasks/docker/main.yml +++ b/tasks/docker/main.yml @@ -52,7 +52,7 @@ - name: Avi Controller | Set service facts for deploy set_fact: - con_new_service: "{{ con_version|version_compare('19.1.1', '>=') }}" + con_new_service: "{{ con_version is version_compare('19.1.1', '>=') }}" - name: Avi Controller | Docker | Cleanup include: services/cleanup.yml diff --git a/tasks/docker/package_deploy.yml b/tasks/docker/package_deploy.yml index 889ec1e..3686ca9 100644 --- a/tasks/docker/package_deploy.yml +++ b/tasks/docker/package_deploy.yml @@ -8,6 +8,7 @@ changed_when: false register: con_load_docker_image -- set_fact: +- name: Set con_version and con_image facts + set_fact: con_version: "{{ con_load_docker_image.stdout }}" con_image: "avinetworks/controller:{{ con_load_docker_image.stdout }}" diff --git a/tasks/docker/services/cleanup.yml b/tasks/docker/services/cleanup.yml index 7a344aa..c01a3eb 100644 --- a/tasks/docker/services/cleanup.yml +++ b/tasks/docker/services/cleanup.yml @@ -30,4 +30,4 @@ - name: Avi Controller | Docker | Cleanup | Remove non-matched controller images. shell: "docker rmi -f {{ con_non_matched_images.stdout_lines|join(' ') }}" changed_when: false - when: con_non_matched_images.stdout != "" + when: con_non_matched_images.stdout diff --git a/tasks/docker/services/initd/check.yml b/tasks/docker/services/initd/check.yml deleted file mode 100644 index 5ba1d85..0000000 --- a/tasks/docker/services/initd/check.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Avi Controller | Check if Avi Controller installed - stat: - path: /etc/init.d/avicontroller - register: avi_installed diff --git a/tasks/docker/services/initd/install.yml b/tasks/docker/services/initd/install.yml deleted file mode 100644 index 4590b1d..0000000 --- a/tasks/docker/services/initd/install.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- name: Avi Controller | Services | init.d | Set container env for non-systemd - set_fact: - con_env_variables_extras: "{{ con_env_variables_extras + ['NON_SYSTEMD=1'] }}" - -- block: - - name: Avi Controller | Services | init.d | Deploy the avicontroller service - template: src=16.x/avicontroller.j2 dest=/etc/init.d/avicontroller mode=0755 - register: avicontroller_service_16 - notify: Avi Controller | Services | init.d | Restart the avicontroller_watcher service - - set_fact: avicontroller_service={{ avicontroller_service_16 }} - when: not con_new_service - -- block: - - name: Avi Controller | Services | init.d | Deploy the avicontroller service | New Service - copy: src=init/avicontroller dest=/etc/init.d/avicontroller mode=0755 - register: avicontroller_service_17 - notify: Avi Controller | Services | init.d | Restart the avicontroller_watcher service - - set_fact: avicontroller_service={{ avicontroller_service_16 }} - when: con_new_service - -- name: Avi Controller | Services | init.d | Deploy the avicontroller_watcher.sh script - copy: src=init/avicontroller_watcher.sh dest=/etc/init.d/avicontroller_watcher.sh mode=0755 - register: avicontroller_watcher_sh - -- name: Avi Controller | Services | init.d | Deploy the avicontroller_watcher service - copy: src=init/avicontroller_watcher dest=/etc/init.d/avicontroller_watcher mode=0755 - register: avicontroller_watcher_service - notify: Avi Controller | Services | init.d | Restart the avicontroller_watcher service - -- name: Avi Controller | Services | init.d | Deploying avicontroller_watcher rc links - file: src=/etc/init.d/avicontroller_watcher dest={{ item }} state=link - with_items: - - /etc/rc0.d/K99avicontroller_watcher - - /etc/rc1.d/K99avicontroller_watcher - - /etc/rc2.d/S99avicontroller_watcher - - /etc/rc3.d/S99avicontroller_watcher - - /etc/rc4.d/S99avicontroller_watcher - - /etc/rc5.d/S99avicontroller_watcher - - /etc/rc6.d/K99avicontroller_watcher diff --git a/tasks/docker/services/install.yml b/tasks/docker/services/install.yml index 0bcf7ef..aebcc37 100644 --- a/tasks/docker/services/install.yml +++ b/tasks/docker/services/install.yml @@ -18,4 +18,4 @@ - name: Avi Controller | Services | {{ ansible_service_mgr }} | Start the service since it's not running | service: name=avicontroller enabled=yes state=started - when: con_desired_running.stdout == "" + when: not con_desired_running.stdout