Change the old meta gerrit group to the expected 'gerrit' group
The code is switching from relying on metadata based groups to dynamically created groups with add_host. As such, the group containing gerrit is now 'gerrit'. Change-Id: I235e445f9e0f7e94f52a0c9dfc0df80b55d49bc1
This commit is contained in:
parent
285f884691
commit
ba3b591b86
@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
# file: boostrap_gerrit.yml
|
# file: boostrap_gerrit.yml
|
||||||
- hosts: meta-infra_type_gerrit
|
- hosts: gerrit
|
||||||
gather_facts: no
|
gather_facts: no
|
||||||
user: ubuntu
|
user: ubuntu
|
||||||
become: true
|
become: true
|
||||||
|
@ -81,7 +81,7 @@
|
|||||||
- name: Deploy Gerrit fqdn hiera file
|
- name: Deploy Gerrit fqdn hiera file
|
||||||
copy: >
|
copy: >
|
||||||
src=hiera/fqdn/gerrit.yaml
|
src=hiera/fqdn/gerrit.yaml
|
||||||
dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_gerrit'][0] }}.yaml
|
dest=/etc/puppet/hieradata/production/fqdn/{{ groups['gerrit'][0] }}.yaml
|
||||||
|
|
||||||
- name: Deploy Zuul fqdn hiera file
|
- name: Deploy Zuul fqdn hiera file
|
||||||
copy: >
|
copy: >
|
||||||
|
@ -4,7 +4,7 @@ class infra-ansible::profiles::zuul {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class { '::zuul':
|
class { '::zuul':
|
||||||
gerrit_server => '{{ groups['meta-infra_type_gerrit'][0] }}',
|
gerrit_server => '{{ groups['gerrit'][0] }}',
|
||||||
gerrit_user => 'gerrit',
|
gerrit_user => 'gerrit',
|
||||||
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
|
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
|
||||||
zuul_url => 'http://{{ groups['meta-infra_type_zuul'][0] }}/p',
|
zuul_url => 'http://{{ groups['meta-infra_type_zuul'][0] }}/p',
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
- hosts: meta-infra_type_gerrit
|
- hosts: gerrit
|
||||||
user: ubuntu
|
user: ubuntu
|
||||||
gather_facts: no
|
gather_facts: no
|
||||||
become: true
|
become: true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user