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.

6 files changed, 62 insertions, 62 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 }}"
diff --git a/roles/openshift_openstack/tasks/hostname.yml b/roles/openshift_openstack/tasks/hostname.yml
index 9815d0e80..e1a18425f 100644
--- a/roles/openshift_openstack/tasks/hostname.yml
+++ b/roles/openshift_openstack/tasks/hostname.yml
@@ -5,7 +5,7 @@
 
 - name: Setting FQDN Fact
   set_fact:
-    new_fqdn: "{{ new_hostname }}.{{ full_dns_domain }}"
+    new_fqdn: "{{ new_hostname }}.{{ openshift_openstack_full_dns_domain }}"
 
 - name: Setting hostname and DNS domain
   hostname: name="{{ new_fqdn }}"
diff --git a/roles/openshift_openstack/tasks/net_vars_check.yaml b/roles/openshift_openstack/tasks/net_vars_check.yaml
index 68afde415..18b9b21b9 100644
--- a/roles/openshift_openstack/tasks/net_vars_check.yaml
+++ b/roles/openshift_openstack/tasks/net_vars_check.yaml
@@ -3,7 +3,7 @@
   fail:
     msg: "Flannel SDN requires a dedicated containers data network and can not work over a provider network"
   when:
-    - openstack_provider_network_name is defined
+    - openshift_openstack_provider_network_name is defined
     - openstack_private_data_network_name is defined
 
 - name: Check the flannel network configuration
diff --git a/roles/openshift_openstack/tasks/node-packages.yml b/roles/openshift_openstack/tasks/node-packages.yml
index c65eaec3b..7864f5269 100644
--- a/roles/openshift_openstack/tasks/node-packages.yml
+++ b/roles/openshift_openstack/tasks/node-packages.yml
@@ -5,11 +5,11 @@
   yum:
     name: "{{ item }}"
     state: latest
-  with_items: "{{ required_packages }}"
+  with_items: "{{ openshift_openstack_required_packages }}"
 
 - name: Install debug packages (optional)
   yum:
     name: "{{ item }}"
     state: latest
-  with_items: "{{ debug_packages }}"
-  when: install_debug_packages|bool
+  with_items: "{{ openshift_openstack_debug_packages }}"
+  when: openshift_openstack_install_debug_packages|bool
diff --git a/roles/openshift_openstack/tasks/populate-dns.yml b/roles/openshift_openstack/tasks/populate-dns.yml
index 669b65a01..080c3aca9 100644
--- a/roles/openshift_openstack/tasks/populate-dns.yml
+++ b/roles/openshift_openstack/tasks/populate-dns.yml
@@ -5,41 +5,41 @@
 
 - name: "Add wildcard records to the private A records for infrahosts"
   set_fact:
-    private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': '*.' + openshift_app_domain, 'ip': hostvars[item]['private_v4'] } ] }}"
+    private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': '*.' + openshift_openstack_app_subdomain, 'ip': hostvars[item]['private_v4'] } ] }}"
   with_items: "{{ groups['infra_hosts'] }}"
 
 - name: "Add public master cluster hostname records to the private A records (single master)"
   set_fact:
-    private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(full_dns_domain, ''))[:-1], 'ip': hostvars[groups.masters[0]].private_v4 } ] }}"
+    private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(openshift_openstack_full_dns_domain, ''))[:-1], 'ip': hostvars[groups.masters[0]].private_v4 } ] }}"
   when:
     - hostvars[groups.masters[0]].openshift_master_cluster_public_hostname is defined
-    - openstack_num_masters == 1
+    - openshift_openstack_num_masters == 1
 
 - name: "Add public master cluster hostname records to the private A records (multi-master)"
   set_fact:
-    private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(full_dns_domain, ''))[:-1], 'ip': hostvars[groups.lb[0]].private_v4 } ] }}"
+    private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(openshift_openstack_full_dns_domain, ''))[:-1], 'ip': hostvars[groups.lb[0]].private_v4 } ] }}"
   when:
     - hostvars[groups.masters[0]].openshift_master_cluster_public_hostname is defined
-    - openstack_num_masters > 1
+    - openshift_openstack_num_masters > 1
 
 - name: "Set the private DNS server to use the external value (if provided)"
   set_fact:
-    nsupdate_server_private: "{{ external_nsupdate_keys['private']['server'] }}"
-    nsupdate_key_secret_private: "{{ external_nsupdate_keys['private']['key_secret'] }}"
-    nsupdate_key_algorithm_private: "{{ external_nsupdate_keys['private']['key_algorithm'] }}"
-    nsupdate_private_key_name: "{{ external_nsupdate_keys['private']['key_name']|default('private-' + full_dns_domain) }}"
+    nsupdate_server_private: "{{ openshift_openstack_external_nsupdate_keys['private']['server'] }}"
+    nsupdate_key_secret_private: "{{ openshift_openstack_external_nsupdate_keys['private']['key_secret'] }}"
+    nsupdate_key_algorithm_private: "{{ openshift_openstack_external_nsupdate_keys['private']['key_algorithm'] }}"
+    nsupdate_private_key_name: "{{ openshift_openstack_external_nsupdate_keys['private']['key_name']|default('private-' + openshift_openstack_full_dns_domain) }}"
   when:
-    - external_nsupdate_keys is defined
-    - external_nsupdate_keys['private'] is defined
+    - openshift_openstack_external_nsupdate_keys is defined
+    - openshift_openstack_external_nsupdate_keys['private'] is defined
 
 
 - name: "Generate the private Add section for DNS"
   set_fact:
     private_named_records:
       - view: "private"
-        zone: "{{ full_dns_domain }}"
+        zone: "{{ openshift_openstack_full_dns_domain }}"
         server: "{{ nsupdate_server_private }}"
-        key_name: "{{ nsupdate_private_key_name|default('private-' + full_dns_domain) }}"
+        key_name: "{{ nsupdate_private_key_name|default('private-' + openshift_openstack_full_dns_domain) }}"
         key_secret: "{{ nsupdate_key_secret_private }}"
         key_algorithm: "{{ nsupdate_key_algorithm_private | lower }}"
         entries: "{{ private_records }}"
@@ -52,58 +52,58 @@
 
 - name: "Add wildcard records to the public A records"
   set_fact:
-    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': '*.' + openshift_app_domain, 'ip': hostvars[item]['public_v4'] } ] }}"
+    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': '*.' + openshift_openstack_app_subdomain, 'ip': hostvars[item]['public_v4'] } ] }}"
   with_items: "{{ groups['infra_hosts'] }}"
   when: hostvars[item]['public_v4'] is defined
 
 - name: "Add public master cluster hostname records to the public A records (single master)"
   set_fact:
-    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(full_dns_domain, ''))[:-1], 'ip': hostvars[groups.masters[0]].public_v4 } ] }}"
+    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(openshift_openstack_full_dns_domain, ''))[:-1], 'ip': hostvars[groups.masters[0]].public_v4 } ] }}"
   when:
     - hostvars[groups.masters[0]].openshift_master_cluster_public_hostname is defined
-    - openstack_num_masters == 1
-    - not openstack_use_bastion|bool
+    - openshift_openstack_num_masters == 1
+    - not openshift_openstack_use_bastion|bool
 
 - name: "Add public master cluster hostname records to the public A records (single master behind a bastion)"
   set_fact:
-    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(full_dns_domain, ''))[:-1], 'ip': hostvars[groups.bastions[0]].public_v4 } ] }}"
+    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(openshift_openstack_full_dns_domain, ''))[:-1], 'ip': hostvars[groups.bastions[0]].public_v4 } ] }}"
   when:
     - hostvars[groups.masters[0]].openshift_master_cluster_public_hostname is defined
-    - openstack_num_masters == 1
-    - openstack_use_bastion|bool
+    - openshift_openstack_num_masters == 1
+    - openshift_openstack_use_bastion|bool
 
 - name: "Add public master cluster hostname records to the public A records (multi-master)"
   set_fact:
-    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(full_dns_domain, ''))[:-1], 'ip': hostvars[groups.lb[0]].public_v4 } ] }}"
+    public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': (hostvars[groups.masters[0]].openshift_master_cluster_public_hostname | replace(openshift_openstack_full_dns_domain, ''))[:-1], 'ip': hostvars[groups.lb[0]].public_v4 } ] }}"
   when:
     - hostvars[groups.masters[0]].openshift_master_cluster_public_hostname is defined
-    - openstack_num_masters > 1
+    - openshift_openstack_num_masters > 1
 
 - name: "Set the public DNS server details to use the external value (if provided)"
   set_fact:
-    nsupdate_server_public: "{{ external_nsupdate_keys['public']['server'] }}"
-    nsupdate_key_secret_public: "{{ external_nsupdate_keys['public']['key_secret'] }}"
-    nsupdate_key_algorithm_public: "{{ external_nsupdate_keys['public']['key_algorithm'] }}"
-    nsupdate_public_key_name: "{{ external_nsupdate_keys['public']['key_name']|default('public-' + full_dns_domain) }}"
+    nsupdate_server_public: "{{ openshift_openstack_external_nsupdate_keys['public']['server'] }}"
+    nsupdate_key_secret_public: "{{ openshift_openstack_external_nsupdate_keys['public']['key_secret'] }}"
+    nsupdate_key_algorithm_public: "{{ openshift_openstack_external_nsupdate_keys['public']['key_algorithm'] }}"
+    nsupdate_public_key_name: "{{ openshift_openstack_external_nsupdate_keys['public']['key_name']|default('public-' + openshift_openstack_full_dns_domain) }}"
   when:
-    - external_nsupdate_keys is defined
-    - external_nsupdate_keys['public'] is defined
+    - openshift_openstack_external_nsupdate_keys is defined
+    - openshift_openstack_external_nsupdate_keys['public'] is defined
 
 - name: "Generate the public Add section for DNS"
   set_fact:
     public_named_records:
       - view: "public"
-        zone: "{{ full_dns_domain }}"
+        zone: "{{ openshift_openstack_full_dns_domain }}"
         server: "{{ nsupdate_server_public }}"
-        key_name: "{{ nsupdate_public_key_name|default('public-' + full_dns_domain) }}"
+        key_name: "{{ nsupdate_public_key_name|default('public-' + openshift_openstack_full_dns_domain) }}"
         key_secret: "{{ nsupdate_key_secret_public }}"
         key_algorithm: "{{ nsupdate_key_algorithm_public | lower }}"
         entries: "{{ public_records }}"
 
 
-- name: "Generate the final dns_records_add"
+- name: "Generate the final openshift_openstack_dns_records_add"
   set_fact:
-    dns_records_add: "{{ private_named_records + public_named_records }}"
+    openshift_openstack_dns_records_add: "{{ private_named_records + public_named_records }}"
 
 
 - name: "Add DNS A records"
@@ -119,7 +119,7 @@
     # TODO(shadower): add a cleanup playbook that removes these records, too!
     state: present
   with_subelements:
-  - "{{ dns_records_add | default({}) }}"
+  - "{{ openshift_openstack_dns_records_add | default({}) }}"
   - entries
   register: nsupdate_add_result
   until: nsupdate_add_result|succeeded
diff --git a/roles/openshift_openstack/tasks/provision.yml b/roles/openshift_openstack/tasks/provision.yml
index e693f535a..dccbe334c 100644
--- a/roles/openshift_openstack/tasks/provision.yml
+++ b/roles/openshift_openstack/tasks/provision.yml
@@ -2,14 +2,14 @@
 - name: Generate the templates
   include: generate-templates.yml
   when:
-  - stack_state == 'present'
+  - openshift_openstack_stack_state == 'present'
 
 - name: Handle the Stack (create/delete)
   ignore_errors: False
   register: stack_create
   os_stack:
-    name: "{{ stack_name }}"
-    state: "{{ stack_state }}"
+    name: "{{ openshift_openstack_stack_name }}"
+    state: "{{ openshift_openstack_stack_state }}"
     template: "{{ stack_template_path | default(omit) }}"
     wait: yes
 
@@ -19,7 +19,7 @@
 - name: CleanUp
   include: cleanup.yml
   when:
-  - stack_state == 'present'
+  - openshift_openstack_stack_state == 'present'
 
 # TODO(shadower): create the registry and PV Cinder volumes if specified
 # and include the `prepare-and-format-cinder-volume` tasks to set it up