Update the naming of openshift on rhv to ovirt

Updated all references of rhv to use ovirt insread,
since this is an upstream repo.

Signed-off-by: Shirly Radco sradco@redhat.com

playbooks/rhv/README.md

@@ -1,16 +1,16 @@
-# RHV Playbooks
+# oVirt Playbooks
 ## Provisioning
-This subdirectory contains the Ansible playbooks used to deploy 
-an OpenShift Container Platform environment on Red Hat Virtualization
+This subdirectory contains the Ansible playbooks used to deploy
+an OpenShift Container Platform environment on oVirt.
 
 ### Where do I start?
 Choose a host from which Ansible plays will be executed. This host must have
-the ability to access the web interface of the RHV cluster engine and the
+the ability to access the web interface of the oVirt cluster engine and the
 network on which the OpenShift nodes will be installed. We will refer to
 this host as the *bastion*.
 
 #### oVirt Ansible Roles
-The oVirt project maintains Ansible roles for managing an oVirt or RHV cluster.
+The oVirt project maintains Ansible roles for managing an oVirt cluster.
 These should be installed on the *bastion* host according to the instructions
 at the [oVirt Ansible Roles page](https://github.com/ovirt/ovirt-ansible/).
 
@@ -25,7 +25,7 @@ for details.
 After populating inventory and variables files with the proper values,
 (see [The OpenShift Advanced Installation Documentation](https://docs.openshift.com/container-platform/latest/install_config/install/advanced_install.html)
 ) a series of Ansible playbooks from this subdirectory will provision a set of
-nodes on the RHV (or oVirt) cluster, prepare them for OpenShift installation,
+nodes on the oVirt cluster, prepare them for OpenShift installation,
 and deploy an OpenShift cluster on them.
 
 #### Step 1 Inventory
@@ -33,17 +33,17 @@ The [`inventory.example`](inventory.example) file here is provided as an example
 environment. It is up to the user to add additional OpenShift specific variables to this file to configure
 required elements such as the registry, storage, authentication, and networking.
 
-One required variable added for this environment is the `openshift_rhv_dns_zone`. As this is used to construct
+One required variable added for this environment is the `openshift_ovirt_dns_zone`. As this is used to construct
 hostnames during VM creation, it is essential that this be set to the default dns zone for those nodes' hostnames.
 
-#### Step 2 RHV Provisioning Variables
+#### Step 2 oVirt Provisioning Variables
 
 Fill out a provisioning variables file (example [`provisioning-vars.yaml.example`](provisioning-vars.yaml.example)
-with values from your RHV environment, making sure to fill in all commented values.
+with values from your oVirt environment, making sure to fill in all commented values.
 
-*Red Hat Virtualization Certificate*
+*oVirt Engine internal Certificate*
 
-A copy of the `/etc/pki/ovirt-engine/ca.pem` from the RHV engine will need to
+A copy of the `/etc/pki/ovirt-engine/ca.pem` from the oVirt engine will need to
 be downloaded to the *bastion* and its location set in the `engine_cafile` variable. Replace the
 example server in the following command to download the certificate:
 
@@ -52,13 +52,13 @@ $ curl --output ca.pem 'http://engine.example.com/ovirt-engine/services/pki-reso
 
 ```
 
-#### Step 3 Provision Virtual Machines in RHV
+#### Step 3 Provision Virtual Machines in oVirt
 Once all the variables in the `provisioning_vars.yaml` file are set, use the
 [`ovirt-vm-infra.yml`](openshift-cluster/ovirt-vm-infra.yml) playbook to begin
 provisioning.
 
 ```
-ansible-playbook -i inventory -e@provisioning_vars.yml ${PATH_TO_OPENSHIFT_ANSIBLE}/playbooks/rhv/openshift-cluster/ovirt-vm-infra.yml
+ansible-playbook -i inventory -e@provisioning_vars.yml ${PATH_TO_OPENSHIFT_ANSIBLE}/playbooks/ovirt/openshift-cluster/ovirt-vm-infra.yml
 ```
 
 #### Step 4 Update DNS

playbooks/rhv/inventory.example

@@ -1,5 +1,5 @@
 [all:vars]
-openshift_rhv_dns_zone=  # example.com
+openshift_ovirt_dns_zone=  # example.com
 
 [OSEv3:children]
 nodes
@@ -15,10 +15,10 @@ openshift_deployment_type=origin
 openshift_enable_service_catalog=False
 
 # Hostnames
-load_balancer_hostname=lb0.{{openshift_rhv_dns_zone}}
+load_balancer_hostname=lb0.{{openshift_ovirt_dns_zone}}
 openshift_master_cluster_hostname="{{ load_balancer_hostname }}"
-openshift_master_cluster_public_hostname=openshift-master.{{ openshift_rhv_dns_zone }}
-openshift_master_default_subdomain=apps.{{ openshift_rhv_dns_zone }}
+openshift_master_cluster_public_hostname=openshift-master.{{ openshift_ovirt_dns_zone }}
+openshift_master_default_subdomain=apps.{{ openshift_ovirt_dns_zone }}
 openshift_public_hostname="{{openshift_master_cluster_public_hostname}}"
 
 # Docker setup for extra disks on nodes

playbooks/rhv/openshift-cluster/ovirt-vm-infra.yml

@@ -16,7 +16,7 @@
         - always
     - name: Build virtual machine facts
       import_role:
-        name: openshift_rhv
+        name: openshift_ovirt
         tasks_from: build_vm_list.yml
 
   roles:

playbooks/rhv/openshift-cluster/ovirt-vm-uninstall.yml

@@ -16,7 +16,7 @@
         - always
     - name: Build virtual machine facts
       import_role:
-        name: openshift_rhv
+        name: openshift_ovirt
         tasks_from: build_vm_list.yml
 
   tasks:

playbooks/rhv/provisioning-vars.yaml.example

@@ -12,9 +12,9 @@ engine_password:                # secret
 engine_cafile:                  # ../ca.pem
 
 data_center_name:               # Default
-openshift_rhv_cluster:          # Default
-openshift_rhv_data_store:       # vmstore
-openshift_rhv_ssh_key: "{{ lookup('file', '~/.ssh/id_rsa.pub') }}"
+openshift_ovirt_cluster:          # Default
+openshift_ovirt_data_store:       # vmstore
+openshift_ovirt_ssh_key: "{{ lookup('file', '~/.ssh/id_rsa.pub') }}"
 
 ##########################
 # Template Creation
@@ -23,10 +23,10 @@ openshift_rhv_ssh_key: "{{ lookup('file', '~/.ssh/id_rsa.pub') }}"
 qcow_url:                       # https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2c
 image_path: "{{ lookup('env', 'HOME') }}/Downloads/{{ template_name }}.qcow2"
 template_name:                  # rhel75
-template_cluster: "{{ openshift_rhv_cluster }}"
+template_cluster: "{{ openshift_ovirt_cluster }}"
 template_memory: 8GiB
 template_cpu: 1
-template_disk_storage: "{{ openshift_rhv_data_store }}"
+template_disk_storage: "{{ openshift_ovirt_data_store }}"
 template_disk_size: 60GiB
 template_nics:
   - name: nic1
@@ -43,39 +43,39 @@ vm_infra_wait_for_ip_delay: 8
 # Virtual machine profile for master nodes
 # Differs from node profile by 16GiB RAM, extra disk for etcd
 master_vm:
-  cluster: "{{ openshift_rhv_cluster }}"
+  cluster: "{{ openshift_ovirt_cluster }}"
   template: "{{ template_name }}"
   memory: 16GiB
   cores: 2
   high_availability: true
   disks:
     - size: 15GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: docker_disk
       interface: virtio
     - size: 30GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: localvol_disk
       interface: virtio
     - size: 25GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: etcd_disk
       interface: virtio
   state: running
 
 # Virtual Machine profile for rest of nodes
 node_vm:
-  cluster: "{{ openshift_rhv_cluster }}"
+  cluster: "{{ openshift_ovirt_cluster }}"
   template: "{{ template_name }}"
   memory: 8GiB
   cores: 2
   disks:
     - size: 15GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: docker_disk
       interface: virtio
     - size: 30GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: localvol_disk
       interface: virtio
   state: running

roles/openshift_rhv/README.md

@@ -1,4 +1,4 @@
-OpenShift RHV
+OpenShift oVirt
 =============
 
 OpenShift Provisioned on Red Hat Virtualization and oVirt
@@ -16,51 +16,51 @@ For documentation on virtual machine profile options, see the [oVirt Ansible VM-
 
 | Name                      | Default value |                                                                                         |
 |---------------------------|---------------|-----------------------------------------------------------------------------------------|
-| openshift_rhv_vm_profile  | See below.    | Dictionary of dictionaries providing common VM parameters for virtual machine creation. |
-| openshift_rhv_vm_manifest | See below.    | List of dictionaries specifying node base name, count, and which of the above profiles to apply. The default creates three master nodes, three infrastructure nodes, one application node, and a load balancer. |
+| openshift_ovirt_vm_profile  | See below.    | Dictionary of dictionaries providing common VM parameters for virtual machine creation. |
+| openshift_ovirt_vm_manifest | See below.    | List of dictionaries specifying node base name, count, and which of the above profiles to apply. The default creates three master nodes, three infrastructure nodes, one application node, and a load balancer. |
 
 ```
-openshift_rhv_vm_profile:
+openshift_ovirt_vm_profile:
   master:
-    cluster: "{{ openshift_rhv_cluster }}"
+    cluster: "{{ openshift_ovirt_cluster }}"
     template: "{{ ovirt_template_name }}"
     memory: 16GiB
     cores: 2
     high_availability: true
     disks:
     - size: 15GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: docker_disk
       interface: virtio
     - size: 30GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: localvol_disk
       interface: virtio
     - size: 25GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: etcd_disk
       interface: virtio
     state: running
   node:
-    cluster: "{{ openshift_rhv_cluster }}"
+    cluster: "{{ openshift_ovirt_cluster }}"
     template: "{{ ovirt_template_name }}"
     memory: 8GiB
     cores: 2
     high_availability: true
     disks:
     - size: 15GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: docker_disk
       interface: virtio
     - size: 30GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: localvol_disk
       interface: virtio
     state: running
 ```
 
 ```
-openshift_rhv_vm_manifest:
+openshift_ovirt_vm_manifest:
 - name: 'master'
   count: 3
   profile: 'master'

roles/openshift_rhv/defaults/main.yml

@@ -1,51 +1,51 @@
 ---
-# Defaults for oVirt/RHV provider integration
+# Defaults for oVirt provider integration
 compatibility_version: 4.2
 data_center_name: Default
 wait_for_ip: true
-openshift_rhv_cluster: Default
+openshift_ovirt_cluster: Default
 template_name: openshift_node
 
 # oVirt VM Profiles
-openshift_rhv_vm_profile:
+openshift_ovirt_vm_profile:
   master:
-    cluster: "{{ openshift_rhv_cluster }}"
+    cluster: "{{ openshift_ovirt_cluster }}"
     template: "{{ template_name }}"
     memory: 16GiB
     cores: 2
     high_availability: true
     disks:
     - size: 15GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: docker_disk
       interface: virtio
     - size: 30GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: localvol_disk
       interface: virtio
     - size: 25GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: etcd_disk
       interface: virtio
     state: running
   node:
-    cluster: "{{ openshift_rhv_cluster }}"
+    cluster: "{{ openshift_ovirt_cluster }}"
     template: "{{ template_name }}"
     memory: 8GiB
     cores: 2
     high_availability: true
     disks:
     - size: 15GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: docker_disk
       interface: virtio
     - size: 30GiB
-      storage_domain: "{{ openshift_rhv_data_store }}"
+      storage_domain: "{{ openshift_ovirt_data_store }}"
       name: localvol_disk
       interface: virtio
     state: running
 
-openshift_rhv_vm_manifest:
+openshift_ovirt_vm_manifest:
 - name: 'master'
   count: 3
   profile: 'master'

roles/openshift_rhv/tasks/build_vm_list.yml

@@ -2,9 +2,9 @@
 # Creates a dictionary for use with oVirt.vm-infra role
 # https://github.com/oVirt/ovirt-ansible-vm-infra
 - fail:
-    msg: "The openshift_rhv_dns_zone variable is required."
+    msg: "The openshift_ovirt_dns_zone variable is required."
   when:
-  - openshift_rhv_dns_zone is not defined
+  - openshift_ovirt_dns_zone is not defined
 - name: Create virtual machine list fact
   set_fact:
     vms: >-
@@ -12,14 +12,14 @@
       {% for iter in range(item.count) -%}
       {% if iter > 0 -%},{% endif -%}
       {
-      'name': '{{ item.name }}{{ iter }}.{{ openshift_rhv_dns_zone }}',
+      'name': '{{ item.name }}{{ iter }}.{{ openshift_ovirt_dns_zone }}',
       'tag': 'openshift_{{ item.profile }}',
       'cloud_init':
       {
-      'host_name': '{{ item.name }}{{ iter }}.{{ openshift_rhv_dns_zone }}',
-      'authorized_ssh_keys': '{{ openshift_rhv_ssh_key }}'
+      'host_name': '{{ item.name }}{{ iter }}.{{ openshift_ovirt_dns_zone }}',
+      'authorized_ssh_keys': '{{ openshift_ovirt_ssh_key }}'
       },
-      'profile':  {{ openshift_rhv_vm_profile[ item.profile ] }} ,
+      'profile':  {{ openshift_ovirt_vm_profile[ item.profile ] }} ,
       }
       {% endfor -%}
       ]
@@ -28,18 +28,18 @@
       {% if item.count > 1 -%}
       {
       'name': '{{ item.name }}_ag',
-      'cluster': '{{ openshift_rhv_cluster }}',
+      'cluster': '{{ openshift_ovirt_cluster }}',
       'vm_enforcing': 'false',
       'vm_rule': 'negative',
       'vms': [
       {% for iter in range(item.count) -%}
-      '{{ item.name }}{{ iter }}.{{ openshift_rhv_dns_zone }}',
+      '{{ item.name }}{{ iter }}.{{ openshift_ovirt_dns_zone }}',
       {% endfor -%}
       ]
       }
       {% endif -%}
       ]
-  with_items: "{{ openshift_rhv_vm_manifest }}"
+  with_items: "{{ openshift_ovirt_vm_manifest }}"
   tags:
-  - openshift_rhv
+  - openshift_ovirt
 ...

setup.py

@@ -74,7 +74,7 @@ def find_playbooks():
     all_playbooks = set()
     included_playbooks = set()
 
-    exclude_dirs = ('adhoc', 'tasks', 'rhv')
+    exclude_dirs = ('adhoc', 'tasks', 'ovirt')
     for yaml_file in find_files(
             os.path.join(os.getcwd(), 'playbooks'),
             exclude_dirs, None, r'^[^\.].*\.ya?ml$'):