Namespace the OpenStack vars

This makes sure that all the variables used in the `openshift_openstack`
role are prefixed with `openshift_openstack_` as is the convention.

1 files changed, 20 insertions, 20 deletions

diff --git a/roles/openshift_openstack/tasks/check-prerequisites.yml b/roles/openshift_openstack/tasks/check-prerequisites.yml
index a91e60640..57c7238d1 100644
--- a/roles/openshift_openstack/tasks/check-prerequisites.yml
+++ b/roles/openshift_openstack/tasks/check-prerequisites.yml
@@ -50,24 +50,24 @@
 # Check Glance image
 - name: Try to get image facts
   os_image_facts:
-    image: "{{ openstack_default_image_name }}"
+    image: "{{ openshift_openstack_default_image_name }}"
   register: image_result
 - name: Check that image is available
   assert:
     that: "image_result.ansible_facts.openstack_image"
-    msg: "Image {{ openstack_default_image_name }} is not available"
+    msg: "Image {{ openshift_openstack_default_image_name }} is not available"
 
 # Check network name
 - name: Try to get network facts
   os_networks_facts:
-    name: "{{ openstack_external_network_name }}"
+    name: "{{ openshift_openstack_external_network_name }}"
   register: network_result
-  when: not openstack_provider_network_name|default(None)
+  when: not openshift_openstack_provider_network_name|default(None)
 - name: Check that network is available
   assert:
     that: "network_result.ansible_facts.openstack_networks"
-    msg: "Network {{ openstack_external_network_name }} is not available"
-  when: not openstack_provider_network_name|default(None)
+    msg: "Network {{ openshift_openstack_external_network_name }} is not available"
+  when: not openshift_openstack_provider_network_name|default(None)
 
 # Check keypair
 # TODO kpilatov: there is no Ansible module for getting OS keypairs
@@ -76,30 +76,30 @@
 - name: Try to show keypair
   command: >
            python -c 'import shade; cloud = shade.openstack_cloud();
-           exit(cloud.get_keypair("{{ openstack_keypair_name }}") is None)'
+           exit(cloud.get_keypair("{{ openshift_openstack_keypair_name }}") is None)'
   ignore_errors: yes
   register: key_result
 - name: Check that keypair is available
   assert:
     that: 'key_result.rc == 0'
-    msg: "Keypair {{ openstack_keypair_name }} is not available"
+    msg: "Keypair {{ openshift_openstack_keypair_name }} is not available"
 
 # Check that custom images are available
 - include: custom_image_check.yaml
   with_items:
-  - "{{ openstack_master_image }}"
-  - "{{ openstack_infra_image }}"
-  - "{{ openstack_node_image }}"
-  - "{{ openstack_lb_image }}"
-  - "{{ openstack_etcd_image }}"
-  - "{{ openstack_dns_image }}"
+  - "{{ openshift_openstack_master_image }}"
+  - "{{ openshift_openstack_infra_image }}"
+  - "{{ openshift_openstack_node_image }}"
+  - "{{ openshift_openstack_lb_image }}"
+  - "{{ openshift_openstack_etcd_image }}"
+  - "{{ openshift_openstack_dns_image }}"
 
 # Check that custom flavors are available
 - include: custom_flavor_check.yaml
   with_items:
-  - "{{ openstack_master_flavor }}"
-  - "{{ openstack_infra_flavor }}"
-  - "{{ openstack_node_flavor }}"
-  - "{{ openstack_lb_flavor }}"
-  - "{{ openstack_etcd_flavor }}"
-  - "{{ openstack_dns_flavor }}"
+  - "{{ openshift_openstack_master_flavor }}"
+  - "{{ openshift_openstack_infra_flavor }}"
+  - "{{ openshift_openstack_node_flavor }}"
+  - "{{ openshift_openstack_lb_flavor }}"
+  - "{{ openshift_openstack_etcd_flavor }}"
+  - "{{ openshift_openstack_dns_flavor }}"