From 29dc8c21c3905eeeff42e78c87c54ddb1161b6b5 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 29 Apr 2015 13:34:13 +0200 Subject: [PATCH] Fix post_puppet_gerrit playbook It was referencing wrong hiera keys and variables --- roles/post_puppet_gerrit/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/post_puppet_gerrit/tasks/main.yml b/roles/post_puppet_gerrit/tasks/main.yml index b866f21..641e93f 100644 --- a/roles/post_puppet_gerrit/tasks/main.yml +++ b/roles/post_puppet_gerrit/tasks/main.yml @@ -13,14 +13,14 @@ delegate_to: "{{ groups['meta-infra_type_puppetmaster'][0] }}" register: zuul_ssh_public_key_contents -- command: hiera -c /etc/puppet/hiera.yaml ssh_project_rsa_pubkey_contents environment=production +- command: hiera -c /etc/puppet/hiera.yaml gerrit_ssh_project_rsa_pubkey_contents environment=production delegate_to: "{{ groups['meta-infra_type_puppetmaster'][0] }}" - register: ssh_project_rsa_pubkey_contents + register: gerrit_ssh_project_rsa_pubkey_contents - command: ssh -p 29418 -o StrictHostKeyChecking=no "{{ gerrit_prompt_var.user_input }}"@localhost gerrit create-group "'Project Bootstrappers'" - command: ssh -p 29418 -o StrictHostKeyChecking=no "{{ gerrit_prompt_var.user_input }}"@localhost gerrit create-group "'Continuous Integration Tools'" -- command: ssh -p 29418 -o StrictHostKeyChecking=no "{{ gerrit_prompt_var.user_input }}"@localhost gerrit create-account --group "'Continuous Integration Tools'" --group Administrators --full-name "'Project Creator'" --email creator@infra-ansible.cloud --ssh-key "'{{ ssh_project_rsa_pubkey_contents.stdout }}'" openstack-project-creator +- command: ssh -p 29418 -o StrictHostKeyChecking=no "{{ gerrit_prompt_var.user_input }}"@localhost gerrit create-account --group "'Continuous Integration Tools'" --group Administrators --full-name "'Project Creator'" --email creator@infra-ansible.cloud --ssh-key "'{{ gerrit_ssh_project_rsa_pubkey_contents.stdout }}'" openstack-project-creator - command: ssh -p 29418 -o StrictHostKeyChecking=no "{{ gerrit_prompt_var.user_input }}"@localhost gerrit create-account --group "'Continuous Integration Tools'" --full-name "'Zuul'" --email zuul@infra-ansible.cloud --ssh-key "'{{ zuul_ssh_public_key_contents.stdout }}'" jenkins