summaryrefslogtreecommitdiffstats
path: root/xci/installer
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-26 10:23:13 +0100
committerMarkos Chandras <mchandras@suse.de>2018-03-26 20:47:17 +0100
commit9e1d3d6e62abf5d0da26a296bcd235f37a54d9c6 (patch)
treefc2fb9d8056786b4543379977fb8e72de3f2125b /xci/installer
parent8f3c33c97acc5fc10a83e7cc7635da67e2460769 (diff)
xci: playbooks: Fixes various ansible-lint warnings
In preparation for adding support for the 'ansible-lint' tool we fix various problems in our playbooks to make the tool happy before we make it mandatory. Some of the problems that are fixed here are - [ANSIBLE0011] All tasks should be named - [ANSIBLE0012] Commands should not change things if nothing needs doing - [ANSIBLE0013] Use shell only when shell functionality is required - [ANSIBLE0010] Package installs should not use latest installer-type:osa deploy-scenario:os-nosdn-nofeature Change-Id: I66c759d3932a414b81b2846393d2d98ce80c0b6d Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/installer')
-rw-r--r--xci/installer/kubespray/playbooks/configure-opnfvhost.yml12
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml59
2 files changed, 52 insertions, 19 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 8166b0e5..eed814ba 100644
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -31,7 +31,7 @@
delete: yes
- name: generate SSH keys
- shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
+ command: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
args:
creates: /root/.ssh/id_rsa
- name: add id_rsa.pub to authorized_keys
@@ -47,15 +47,19 @@
path: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory"
state: absent
- name: copy kubespray inventory directory
- shell: "cp -rf {{ remote_xci_flavor_files }}/inventory \
+ command: "cp -rf {{ remote_xci_flavor_files }}/inventory \
{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory"
+ args:
+ creates: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory"
- name: make sure kubespray/opnfv_inventory/group_vars/ exist
file:
path: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars"
state: directory
- name: copy k8s_cluster.yml
- shell: "cp -rf {{ remote_xci_path }}/xci/installer/kubespray/files/k8s-cluster.yml \
+ command: "cp -rf {{ remote_xci_path }}/xci/installer/kubespray/files/k8s-cluster.yml \
{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars"
+ args:
+ creates: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars"
- name: Install required packages
package:
name: "{{ kube_require_packages[ansible_pkg_mgr] }}"
@@ -82,3 +86,5 @@
tasks:
- name: Append public keys to authorized_keys
shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> {{ xci_path }}/xci/files/authorized_keys"
+ args:
+ creates: "{{ xci_path }}/xci/files/authorized_keys"
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 2485f477..001fcee3 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -44,9 +44,10 @@
tasks:
- name: generate SSH keys
- shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
+ command: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
args:
creates: "{{ ansible_env.HOME }}/.ssh/id_rsa"
+ changed_when: True
- name: fetch public key
fetch:
src: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
@@ -59,17 +60,27 @@
recursive: yes
delete: yes
- name: copy flavor inventory
- shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/inventory {{ remote_xci_playbooks }}"
+ command: "/bin/cp -rf {{ remote_xci_flavor_files }}/inventory {{ remote_xci_playbooks }}"
+ args:
+ creates: "{{ remote_xci_playbooks }}/inventory"
- name: copy openstack_deploy
- shell: "/bin/cp -rf {{openstack_osa_path}}/etc/openstack_deploy {{openstack_osa_etc_path}}"
+ command: "/bin/cp -rf {{openstack_osa_path}}/etc/openstack_deploy {{openstack_osa_etc_path}}"
+ args:
+ creates: "{{ openstack_osa_etc_path }}"
- name: copy openstack_user_config.yml
- shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/openstack_user_config.yml {{openstack_osa_etc_path}}"
+ command: "/bin/cp -rf {{ remote_xci_flavor_files }}/openstack_user_config.yml {{openstack_osa_etc_path}}"
+ args:
+ creates: "{{ openstack_osa_etc_path }}/openstack_user_config.yml"
failed_when: false
- name: copy all user override files
- shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables.yml {{openstack_osa_etc_path}}"
+ command: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables.yml {{openstack_osa_etc_path}}"
+ args:
+ creates: "{{ openstack_osa_etc_path }}/user_variables.yml }}"
failed_when: false
- name: copy cinder.yml
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/cinder.yml {{openstack_osa_etc_path}}/env.d"
+ command: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/cinder.yml {{openstack_osa_etc_path}}/env.d"
+ args:
+ creates: "{{ openstack_osa_etc_path }}/env.d/cinder.yml"
- name: Configure OpenStack-Ansible components
lineinfile:
path: "{{ openstack_osa_etc_path }}/user_variables.yml"
@@ -81,15 +92,23 @@
- { component: "core_openstack", value: "{{ core_openstack_install | bool }}" }
- block:
- name: copy ceph.yml
- shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/ceph.yml {{openstack_osa_etc_path}}/conf.d/"
+ command: "/bin/cp -rf {{ remote_xci_flavor_files }}/ceph.yml {{openstack_osa_etc_path}}/conf.d/"
+ args:
+ creates: "{{ openstack_osa_etc_path }}/conf.d/ceph.yml"
- name: copy user_ceph.yml
- shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_ceph.yml {{openstack_osa_etc_path}}/user_ceph.yml"
+ command: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_ceph.yml {{openstack_osa_etc_path}}/user_ceph.yml"
+ args:
+ creates: "{{ openstack_osa_etc_path }}/user_ceph.yml"
- name: copy user_variables_ceph.yml
- shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables_ceph.yml {{openstack_osa_etc_path}}/user_variables_ceph.yml"
+ command: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables_ceph.yml {{openstack_osa_etc_path}}/user_variables_ceph.yml"
+ args:
+ creates: "{{ openstack_osa_etc_path }}/user_variables_ceph.yml"
when: xci_ceph_enabled == "true"
- block:
- name: copy user_variables_proxy.yml
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/user_variables_proxy.yml {{openstack_osa_etc_path}}/user_variables_proxy.yml"
+ command: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/user_variables_proxy.yml {{openstack_osa_etc_path}}/user_variables_proxy.yml"
+ args:
+ creates: "{{ openstack_osa_etc_path }}/user_variables_proxy.yml"
- name: "Configure http_proxy_env_url"
lineinfile:
path: "{{openstack_osa_etc_path}}/user_variables_proxy.yml"
@@ -98,21 +117,28 @@
when:
- lookup('env','http_proxy') != "randomfoobarstring"
- name: copy OPNFV OpenStack playbook
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/setup-openstack.yml {{openstack_osa_path}}/playbooks"
+ command: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/setup-openstack.yml {{openstack_osa_path}}/playbooks"
+ args:
+ creates: "{{ openstack_osa_path }}/playbooks/setup-openstack.yml"
- name: copy pinned versions of OSA Roles and global requirements
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/{{ item }} {{openstack_osa_path}}/{{ item }}"
+ command: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/{{ item }} {{openstack_osa_path}}/{{ item }}"
+ args:
+ creates: "{{ openstack_osa_path }}/{{ item }}"
with_items:
- "ansible-role-requirements.yml"
- "global-requirement-pins.txt"
when:
- openstack_osa_version != "master"
- name: copy pinned versions of OpenStack services
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/openstack_services.yml {{openstack_osa_path}}/playbooks/defaults/repo_packages/openstack_services.yml"
+ command: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/openstack_services.yml {{openstack_osa_path}}/playbooks/defaults/repo_packages/openstack_services.yml"
+ args:
+ creates: "{{ openstack_osa_path }}/playbooks/defaults/repo_packages/openstack_services.yml"
when:
- openstack_osa_version != "master"
- include: "{{ xci_path }}/xci/playbooks/bootstrap-scenarios.yml"
- name: bootstrap ansible on opnfv host
command: "/bin/bash ./scripts/bootstrap-ansible.sh"
+ changed_when: True
args:
chdir: "{{openstack_osa_path}}"
- name: install opnfv pip required packages
@@ -131,9 +157,8 @@
extra_args: '-c https://raw.githubusercontent.com/openstack/requirements/{{ requirements_git_install_branch }}/upper-constraints.txt'
executable: '/opt/ansible-runtime/bin/pip'
- name: Determine ARA callback location
- shell: "/opt/ansible-runtime/bin/python -c 'import os,ara; print(os.path.dirname(ara.__file__))'"
- args:
- executable: /bin/bash
+ command: "/opt/ansible-runtime/bin/python -c 'import os,ara; print(os.path.dirname(ara.__file__))'"
+ changed_when: False
register: _ara_install_dir
- name: Create local Ansible plugins directory
file:
@@ -149,6 +174,7 @@
command: "python pw-token-gen.py --file {{openstack_osa_etc_path}}/user_secrets.yml"
args:
chdir: "{{openstack_osa_path}}/scripts"
+ changed_when: True
- name: check if certificate directory /etc/ssl/certs exists already
stat: path=/etc/ssl/certs
register: check_etc_ssl_certs
@@ -184,6 +210,7 @@
tasks:
- name: Append public keys to authorized_keys
shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> {{ xci_path }}/xci/files/authorized_keys"
+ changed_when: True
- hosts: opnfv
remote_user: root