diff options
author | Michal Zegan <m.zegan@samsung.com> | 2019-04-30 14:52:13 +0200 |
---|---|---|
committer | Michal Zegan <m.zegan@samsung.com> | 2019-06-03 14:49:32 +0200 |
commit | 1ec19b0598382aa45258ed630ee26cba4fb3a7e5 (patch) | |
tree | 795a6486f4d40a1890a79e65a0afad6397c44d3e /ansible/roles/rke/tasks | |
parent | 82052ddde7b2896c05c7b930d8e09d582025f0b3 (diff) |
Add molecule tests for rke role
This change adds molecule tests for the rke role, and
modifies the rke role itself to be more idempotent/to
pass linter.
Note that this molecule test case uses a separate
role to install docker in containers, that runs
docker daemon inside of them instead of using host docker.
Issue-ID: OOM-1778
Change-Id: I875f3ff2ab961e5428acee5a02287a8d2d6e9969
Signed-off-by: Michal Zegan <m.zegan@samsung.com>
Diffstat (limited to 'ansible/roles/rke/tasks')
-rw-r--r-- | ansible/roles/rke/tasks/rke_config.yml | 1 | ||||
-rw-r--r-- | ansible/roles/rke/tasks/rke_deploy.yml | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ansible/roles/rke/tasks/rke_config.yml b/ansible/roles/rke/tasks/rke_config.yml index 4112e107..9dc0d8c6 100644 --- a/ansible/roles/rke/tasks/rke_config.yml +++ b/ansible/roles/rke/tasks/rke_config.yml @@ -37,6 +37,7 @@ template: src: cluster.yml.j2 dest: "{{ cluster_config_dir }}/cluster.yml" + register: cluster_yml - name: Prepare rke addon manifest (dashboard) template: diff --git a/ansible/roles/rke/tasks/rke_deploy.yml b/ansible/roles/rke/tasks/rke_deploy.yml index 9983d08a..7b36f55d 100644 --- a/ansible/roles/rke/tasks/rke_deploy.yml +++ b/ansible/roles/rke/tasks/rke_deploy.yml @@ -1,8 +1,17 @@ --- +- name: "Check if rke is deployed" + command: "rke version" + args: + chdir: "{{ cluster_config_dir }}" + failed_when: false + changed_when: false + register: rke_deployed + - name: Run rke up command: "{{ rke_bin_dir }}/rke up --config cluster.yml" args: chdir: "{{ cluster_config_dir }}" + when: rke_deployed.rc != 0 or cluster_yml.changed # noqa 503 - name: Ensure .kube directory is present file: |