Merge "Add install-puppet to base playbook"
This commit is contained in:
commit
65f96790cb
@ -131,6 +131,14 @@
|
|||||||
label: ubuntu-bionic
|
label: ubuntu-bionic
|
||||||
- name: centos7
|
- name: centos7
|
||||||
label: centos-7
|
label: centos-7
|
||||||
|
groups:
|
||||||
|
# We test puppet installation on this group. Note bionic not
|
||||||
|
# in here as we have no bionic puppeted nodes (yet?)
|
||||||
|
- name: puppet
|
||||||
|
nodes:
|
||||||
|
- trusty
|
||||||
|
- xenial
|
||||||
|
- centos7
|
||||||
host-vars:
|
host-vars:
|
||||||
trusty:
|
trusty:
|
||||||
ansible_python_interpreter: python2
|
ansible_python_interpreter: python2
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
- hosts: "puppet:!disabled"
|
- hosts: "puppet:!disabled"
|
||||||
roles:
|
roles:
|
||||||
|
- puppet-install
|
||||||
- disable-puppet-agent
|
- disable-puppet-agent
|
||||||
|
|
||||||
- hosts: "!ci-backup:!disabled"
|
- hosts: "!ci-backup:!disabled"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user