Adjustments to fix pbench with browbeat

ansible/install/group_vars/all

@@ -2,6 +2,6 @@
 ansible_sudo: yes
 
 connmon_host: 192.0.2.1
-dns_server: 10.16.36.29
+dns_server: 8.8.8.8
-pbench_repo_file_url: http://pbench.perf.lab.eng.bos.redhat.com/repo/yum.repos.d/pbench.repo
+pbench_repo_file_url: http://pbench.example.com/repo/yum.repos.d/pbench.repo
 repo_name: rhos-release-rhel-7.2.repo

ansible/install/install.yml

@@ -24,7 +24,8 @@
     director: false
     pbench: false
     shaker: false
-    stack_ssh_key: "{{ lookup('file', 'roles/common/files/stack_id_rsa.pub') }}"
+    director_root_ssh_key: "{{ lookup('file', 'roles/pbench/files/director_root_id_rsa.pub') }}"
+    director_stack_ssh_key: "{{ lookup('file', 'roles/pbench/files/director_stack_id_rsa.pub') }}"
   roles:
   - common
   - connmon

ansible/install/roles/keystone/tasks/main.yml

@@ -49,7 +49,7 @@
 
 - name: Restart httpd service
   service: name=httpd state=restarted
-  when: "'httpd' in '{{ keystone_deployment }}'"
+  when: connmon and "'httpd' in '{{ keystone_deployment }}'"
 
 #
 # Restart keystone when in eventlet
@@ -57,16 +57,16 @@
 
 - name: Unmanage keystone service from pacemaker
   command: pcs resource unmanage openstack-keystone
-  when: "'eventlet' in '{{ keystone_deployment }}'"
+  when: connmon and "'eventlet' in '{{ keystone_deployment }}'"
 
 - name: Restart keystone service
   service: name=openstack-keystone state=restarted
-  when: "'eventlet' in '{{ keystone_deployment }}'"
+  when: connmon and "'eventlet' in '{{ keystone_deployment }}'"
 
 - name: Manage keystone service from pacemaker
   command: pcs resource manage openstack-keystone
-  when: "'eventlet' in '{{ keystone_deployment }}'"
+  when: connmon and "'eventlet' in '{{ keystone_deployment }}'"
 
 - name: Cleanup keystone service in pacemaker
   command: pcs resource cleanup openstack-keystone
-  when: "'eventlet' in '{{ keystone_deployment }}'"
+  when: connmon and "'eventlet' in '{{ keystone_deployment }}'"

ansible/install/roles/pbench/tasks/main.yml

@@ -15,8 +15,17 @@
   file: path=/var/lib/pbench-agent state=directory owner=stack group=stack recurse=yes
   when: director
 
+- name: Ensure pbench id_rsa is owned by stack
+  file: path=/opt/pbench-agent/id_rsa owner=stack group=stack
+  when: director
+
+- name: Get director root ssh public key
+  fetch: src=/root/.ssh/id_rsa.pub dest=roles/pbench/files/director_root_id_rsa.pub flat=yes
+  when: director
+  changed_when: false
+
 - name: Get director stack ssh public key
-  fetch: src=/home/stack/.ssh/id_rsa.pub dest=roles/common/files/stack_id_rsa.pub flat=yes
+  fetch: src=/home/stack/.ssh/id_rsa.pub dest=roles/pbench/files/director_stack_id_rsa.pub flat=yes
   when: director
   changed_when: false
 
@@ -24,6 +33,10 @@
   lineinfile: dest=/root/.ssh/authorized_keys state=absent regexp="Please login as the user" mode=0600
   when: not director
 
-- name: Copy director stack ssh public key to controllers/compute authorized_keys
+- name: Copy director root ssh public key to controllers/compute root user's authorized_keys
-  lineinfile: dest=/root/.ssh/authorized_keys state=present line="{{ stack_ssh_key }}"
+  lineinfile: dest=/root/.ssh/authorized_keys state=present line="{{ director_root_ssh_key }}"
+  when: not director
+
+- name: Copy director stack ssh public key to controllers/compute root user's authorized_keys
+  lineinfile: dest=/root/.ssh/authorized_keys state=present line="{{ director_stack_ssh_key }}"
   when: not director

requirements.txt

@@ -0,0 +1,4 @@
+ansible
+
+# For pbench-agent compatibility:
+configtools