diff options
Diffstat (limited to 'tools/cicdansible')
4 files changed, 6 insertions, 3 deletions
diff --git a/tools/cicdansible/heat/config.yaml b/tools/cicdansible/heat/config.yaml index e1f0309f..0521d72e 100644 --- a/tools/cicdansible/heat/config.yaml +++ b/tools/cicdansible/heat/config.yaml @@ -6,5 +6,5 @@ output: { all: "/dev/console" } #Initialization. runcmd: - | - set -efxu -o pipefail + set -efxu %{NOTIFY_COMMAND} --data-binary '{"status": "SUCCESS", "reason": "instance started successfully"}' diff --git a/tools/cicdansible/roles/install/tasks/install.yml b/tools/cicdansible/roles/install/tasks/install.yml index 529e2acf..5c4bcd81 100644 --- a/tools/cicdansible/roles/install/tasks/install.yml +++ b/tools/cicdansible/roles/install/tasks/install.yml @@ -14,7 +14,7 @@ unarchive: src: "resources/{{ hostvars[groups['resources'][0]].resources_sw_filename }}" dest: "{{ installer_deploy_path }}" -#Generate ansible inventory and extra vars. +#Generate ansible inventory and extra vars - name: "Generate ansible inventory for installer" template: src: inventory.yml.j2 diff --git a/tools/cicdansible/roles/install/templates/inventory.yml.j2 b/tools/cicdansible/roles/install/templates/inventory.yml.j2 index faec5903..9f7e08f8 100644 --- a/tools/cicdansible/roles/install/templates/inventory.yml.j2 +++ b/tools/cicdansible/roles/install/templates/inventory.yml.j2 @@ -1,5 +1,8 @@ all: vars: +{% if hostvars['infra'].ansible_distribution in ["Debian","Ubuntu"] %} + ansible_python_interpreter: "/usr/bin/python3" +{% endif %} ansible_ssh_private_key_file: /root/.ssh/id_rsa ansible_ssh_common_args: "-o StrictHostKeyChecking=no" children: diff --git a/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/configure/volume.yml b/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/configure/volume.yml index 8c553850..568b7202 100644 --- a/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/configure/volume.yml +++ b/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/configure/volume.yml @@ -7,7 +7,7 @@ partition_path: "{{ volume_path }}-part1" - name: "Wait for volume" #We do not do it normally, because we want to trigger udev (workaround for some bugs). - shell: "udevadm trigger && udevadm settle && [[ -b {{ volume_path }} ]]" + shell: "udevadm trigger && udevadm settle && [ -b {{ volume_path }} ]" register: result retries: 30 delay: 10 |