Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

more adjusting to ansible not wanting | in when

Browse source
This commit is contained in:
Kevin Fenzi 2018-04-04 22:52:22 +00:00
parent ca009a7d62
commit d8d79f7933
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/copr-keygen.yml
View file

@ -18,7 +18,7 @@
register: facts register: facts
- name: install python2 and dnf stuff - name: install python2 and dnf stuff
raw: dnf -y install python-dnf libselinux-python yum raw: dnf -y install python-dnf libselinux-python yum
when: facts|failed when: facts is failed
- name: cloud basic setup - name: cloud basic setup
hosts: copr-keygen-stg:copr-keygen hosts: copr-keygen-stg:copr-keygen

2
playbooks/transient_cloud_instance.yml
View file

@ -53,7 +53,7 @@
- name: install python2 and dnf stuff - name: install python2 and dnf stuff
raw: dnf -y install python-dnf libselinux-python raw: dnf -y install python-dnf libselinux-python
when: facts|failed when: facts is failed
- name: provision instance - name: provision instance
hosts: tmp_just_created hosts: tmp_just_created

4
roles/dnf-automatic/tasks/main.yml
View file

@ -39,7 +39,7 @@
- name: start dnf-automatic.timer if it is not active - name: start dnf-automatic.timer if it is not active
command: systemctl start dnf-automatic.timer command: systemctl start dnf-automatic.timer
when: automaticative|failed and ansible_distribution_major_version|int < 26 when: automaticative is failed and ansible_distribution_major_version|int < 26
- name: enable and start dnf-automatic f26+ - name: enable and start dnf-automatic f26+
command: systemctl enable dnf-automatic-install.timer command: systemctl enable dnf-automatic-install.timer
@ -59,7 +59,7 @@
- name: start dnf-automatic-install.timer if it is not active - name: start dnf-automatic-install.timer if it is not active
command: systemctl start dnf-automatic-install.timer command: systemctl start dnf-automatic-install.timer
when: automaticative|failed and ansible_distribution_major_version|int >= 26 when: automaticative is failed and ansible_distribution_major_version|int >= 26
- name: disable silly makecache timer - name: disable silly makecache timer
systemd: name=dnf-makecache masked=yes systemd: name=dnf-makecache masked=yes

2
roles/nginx/tasks/ssl-setup.yml
View file

@ -31,7 +31,7 @@
command: openssl req -new -nodes -x509 -subj "{{ ssl_self_signed_string }}" -days 3650 -keyout /etc/nginx/conf.d/ssl.key -out /etc/nginx/conf.d/ssl.pem -extensions v3_ca command: openssl req -new -nodes -x509 -subj "{{ ssl_self_signed_string }}" -days 3650 -keyout /etc/nginx/conf.d/ssl.key -out /etc/nginx/conf.d/ssl.pem -extensions v3_ca
args: args:
creates: /etc/nginx/conf.d/ssl.pem creates: /etc/nginx/conf.d/ssl.pem
when: setup_ssl_key|failed or setup_ssl_pem|failed when: setup_ssl_key is failed or setup_ssl_pem is failed
- name: warn that the next step takes a while - name: warn that the next step takes a while
debug: debug:

10
tasks/persistent_cloud.yml
View file

@ -26,7 +26,7 @@
floating_ips: floating_ips:
- "{{public_ip}}" - "{{public_ip}}"
register: nova_result register: nova_result
when: host_is_up|failed when: host_is_up is failed
# instance can be both id and name, volume must be id # instance can be both id and name, volume must be id
# volume must be id # volume must be id
@ -53,27 +53,27 @@
- name: wait for he host to be hot - name: wait for he host to be hot
local_action: wait_for host={{ public_ip }} port=22 delay=1 timeout=600 local_action: wait_for host={{ public_ip }} port=22 delay=1 timeout=600
when: host_is_up|failed when: host_is_up is failed
# SSH is up and running, however cloud-init still did not deployed ssh keypair # SSH is up and running, however cloud-init still did not deployed ssh keypair
# we have to wait some time. 10 sec is usually enough, but not always. # we have to wait some time. 10 sec is usually enough, but not always.
- name: waiting for cloud-init - name: waiting for cloud-init
pause: seconds=30 pause: seconds=30
when: host_is_up|failed when: host_is_up is failed
- name: gather ssh host key from new instance - name: gather ssh host key from new instance
local_action: command ssh-keyscan -t rsa {{ inventory_hostname }} local_action: command ssh-keyscan -t rsa {{ inventory_hostname }}
ignore_errors: True ignore_errors: True
register: hostkey register: hostkey
when: host_is_up|failed when: host_is_up is failed
- name: add new ssh host key (until we can sign it) - name: add new ssh host key (until we can sign it)
local_action: known_hosts path={{item}} key="{{ hostkey.stdout }}" host={{ inventory_hostname }} state=present local_action: known_hosts path={{item}} key="{{ hostkey.stdout }}" host={{ inventory_hostname }} state=present
ignore_errors: True ignore_errors: True
with_items: with_items:
- /root/.ssh/known_hosts - /root/.ssh/known_hosts
when: host_is_up|failed when: host_is_up is failed
# #
# Next we try and gather facts. If the host doesn't have python2 this will fail. # Next we try and gather facts. If the host doesn't have python2 this will fail.