Remove downstream (OSP*) references into upstream OSP series name.

Change-Id: I9756cc114e14eabc23782144f1e99473e0d010be

ansible/browbeat/adjustment-nova-allocation.yml

@@ -8,9 +8,8 @@
 # ansible-playbook -i hosts browbeat/adjustment-nova-allocation.yml -e "cpu_allocation_ratio=24 ram_allocation_ratio=10.0 disk_allocation_ratio=10.0"
 #
 # * Note not setting a variable does not change that configuration item then. Setting no variables
-#   and running the playbook sets all configuration items back to defaults
+#   and running the playbook sets all configuration items to defaults (cpu/ram/disk - 16/1/1)
 #
-# Defaults (defaults being what OSPd9 comes with out of the box cpu/ram/disk - 16/1/1)
 # ansible-playbook -i hosts browbeat/adjustment-nova-allocation.yml
 #
 

ansible/install/browbeat.yml

@@ -1,6 +1,6 @@
 ---
 #
-# Playbook to install Browbeat (Rally + Shaker) on undercloud
+# Playbook to install Browbeat (Rally + Shaker + PerfKitBenchmarker) on undercloud
 #
 
 - hosts: controller

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

@@ -168,7 +168,7 @@
   file: path="{{ home_dir }}" state=directory mode=0755
   when: browbeat_results_in_httpd
 
-# (akrzos) Port 9000 is already in use by zaqar-server (OSPd10) and thus the fact that likely the
+# (akrzos) Port 9000 is already in use by zaqar-server with Newton and thus the fact that likely the
 # user will choose a port that is not enabled by selinux to allow httpd to listen, we need to modify
 # the ports enabled by selinux for httpd.  If the port is already defined you will run into this
 # issue if you use the "seport" ansible module:
@@ -316,18 +316,11 @@
     - "{{ images }}"
     - "{{ image_exists.results }}"
 
-- name: Upload image into cloud (OSP8)
+- name: Upload image into cloud (Liberty and >Liberty versions)
   shell: . {{ overcloudrc }}; glance image-create --name {{ item }} --visibility public --disk-format=qcow2 --container-format=bare < {{ home_dir }}/{{ item }}
-  register: image_osp8
   ignore_errors: true
   with_items: "{{ images }}"
 
-- name: Upload image into cloud (OSP7)
-  shell: . {{ overcloudrc }}; glance image-create --name {{ item.item }} --is-public true --disk-format=qcow2 --container-format=bare < {{ home_dir }}/{{ item.item }}
-  when: not item.rc == 0
-  ignore_errors: true
-  with_items: "{{ image_osp8.results }}"
-
 #
 # Add additional flavor to overcloud
 #