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.

2 files changed, 56 insertions, 56 deletions

diff --git a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
index 7d8dc157e..1e55adb9e 100644
--- a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -2,10 +2,10 @@
 openshift_deployment_type: origin
 #openshift_deployment_type: openshift-enterprise
 #openshift_release: v3.5
-openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}"
+openshift_master_default_subdomain: "apps.{{ openshift_openstack_clusterid }}.{{ openshift_openstack_public_dns_domain }}"
 
 openshift_master_cluster_method: native
-openshift_master_cluster_hostname: "console.{{ env_id }}.{{ public_dns_domain }}"
+openshift_master_cluster_hostname: "console.{{ openshift_openstack_clusterid }}.{{ openshift_openstack_public_dns_domain }}"
 openshift_master_cluster_public_hostname: "{{ openshift_master_cluster_hostname }}"
 
 osm_default_node_selector: 'region=primary'
@@ -29,10 +29,10 @@ openshift_hosted_registry_wait: True
 
 ## NOTE(shadower): This won't work until the openshift-ansible issue #5657 is fixed:
 ## https://github.com/openshift/openshift-ansible/issues/5657
-## If you're using the `cinder_hosted_registry_name` option from
+## If you're using the `openshift_openstack_cinder_hosted_registry_name` option from
 ## `all.yml`, uncomment these lines:
-#openshift_hosted_registry_storage_openstack_volumeID: "{{ lookup('os_cinder', cinder_hosted_registry_name).id }}"
-#openshift_hosted_registry_storage_volume_size: "{{ cinder_hosted_registry_size_gb }}Gi"
+#openshift_hosted_registry_storage_openstack_volumeID: "{{ lookup('os_cinder', openshift_openstack_cinder_hosted_registry_name).id }}"
+#openshift_hosted_registry_storage_volume_size: "{{ openshift_openstack_cinder_hosted_registry_size_gb }}Gi"
 
 ## If you're using a Cinder volume you've set up yourself, uncomment these lines:
 #openshift_hosted_registry_storage_openstack_volumeID: e0ba2d73-d2f9-4514-a3b2-a0ced507fa05
diff --git a/playbooks/openstack/sample-inventory/group_vars/all.yml b/playbooks/openstack/sample-inventory/group_vars/all.yml
index e0618d685..450642c81 100644
--- a/playbooks/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/all.yml
@@ -1,59 +1,59 @@
 ---
-env_id: "openshift"
-public_dns_domain: "example.com"
-openstack_dns_nameservers: []
+openshift_openstack_clusterid: "openshift"
+openshift_openstack_public_dns_domain: "example.com"
+openshift_openstack_dns_nameservers: []
 
 # # Used Hostnames
 # # - set custom hostnames for roles by uncommenting corresponding lines
-#openstack_master_hostname: "master"
-#openstack_infra_hostname: "infra-node"
-#openstack_node_hostname: "app-node"
-#openstack_lb_hostname: "lb"
-#openstack_etcd_hostname: "etcd"
-#openstack_dns_hostname: "dns"
-
-openstack_keypair_name: "openshift"
-openstack_external_network_name: "public"
-#openstack_private_network_name:  "openshift-ansible-{{ stack_name }}-net"
+#openshift_openstack_master_hostname: "master"
+#openshift_openstack_infra_hostname: "infra-node"
+#openshift_openstack_node_hostname: "app-node"
+#openshift_openstack_lb_hostname: "lb"
+#openshift_openstack_etcd_hostname: "etcd"
+#openshift_openstack_dns_hostname: "dns"
+
+openshift_openstack_keypair_name: "openshift"
+openshift_openstack_external_network_name: "public"
+#openshift_openstack_private_network_name:  "openshift-ansible-{{ openshift_openstack_stack_name }}-net"
 # # A dedicated Neutron network name for containers data network
-# # Configures the data network to be separated from openstack_private_network_name
+# # Configures the data network to be separated from openshift_openstack_private_network_name
 # # NOTE: this is only supported with Flannel SDN yet
-#openstack_private_data_network_name: "openshift-ansible-{{ stack_name }}-data-net"
+#openstack_private_data_network_name: "openshift-ansible-{{ openshift_openstack_stack_name }}-data-net"
 
 ## If you want to use a provider network, set its name here.
-## NOTE: the `openstack_external_network_name` and
-## `openstack_private_network_name` options will be ignored when using a
+## NOTE: the `openshift_openstack_external_network_name` and
+## `openshift_openstack_private_network_name` options will be ignored when using a
 ## provider network.
-#openstack_provider_network_name: "provider"
+#openshift_openstack_provider_network_name: "provider"
 
 # # Used Images
 # # - set specific images for roles by uncommenting corresponding lines
-# # - note: do not remove openstack_default_image_name definition
-#openstack_master_image_name: "centos7"
-#openstack_infra_image_name: "centos7"
-#openstack_node_image_name: "centos7"
-#openstack_lb_image_name: "centos7"
-#openstack_etcd_image_name: "centos7"
-#openstack_dns_image_name: "centos7"
-openstack_default_image_name: "centos7"
-
-openstack_num_masters: 1
-openstack_num_infra: 1
-openstack_num_nodes: 2
+# # - note: do not remove openshift_openstack_default_image_name definition
+#openshift_openstack_master_image_name: "centos7"
+#openshift_openstack_infra_image_name: "centos7"
+#openshift_openstack_node_image_name: "centos7"
+#openshift_openstack_lb_image_name: "centos7"
+#openshift_openstack_etcd_image_name: "centos7"
+#openshift_openstack_dns_image_name: "centos7"
+openshift_openstack_default_image_name: "centos7"
+
+openshift_openstack_num_masters: 1
+openshift_openstack_num_infra: 1
+openshift_openstack_num_nodes: 2
 
 # # Used Flavors
 # # - set specific flavors for roles by uncommenting corresponding lines
-# # - note: do note remove openstack_default_flavor definition
-#openstack_master_flavor: "m1.medium"
-#openstack_infra_flavor: "m1.medium"
-#openstack_node_flavor: "m1.medium"
-#openstack_lb_flavor: "m1.medium"
-#openstack_etcd_flavor: "m1.medium"
-#openstack_dns_flavor: "m1.medium"
-openstack_default_flavor: "m1.medium"
+# # - note: do note remove openshift_openstack_default_flavor definition
+#openshift_openstack_master_flavor: "m1.medium"
+#openshift_openstack_infra_flavor: "m1.medium"
+#openshift_openstack_node_flavor: "m1.medium"
+#openshift_openstack_lb_flavor: "m1.medium"
+#openshift_openstack_etcd_flavor: "m1.medium"
+#openshift_openstack_dns_flavor: "m1.medium"
+openshift_openstack_default_flavor: "m1.medium"
 
 # # Numerical index of nodes to remove
-# openstack_nodes_to_remove: []
+# openshift_openstack_nodes_to_remove: []
 
 # # Docker volume size
 # # - set specific volume size for roles by uncommenting corresponding lines
@@ -69,22 +69,22 @@ docker_volume_size: "15"
 ## Specify server group policies for master and infra nodes. Nova must be configured to
 ## enable these policies. 'anti-affinity' will ensure that each VM is launched on a
 ## different physical host.
-#openstack_master_server_group_policies: [anti-affinity]
-#openstack_infra_server_group_policies: [anti-affinity]
+#openshift_openstack_master_server_group_policies: [anti-affinity]
+#openshift_openstack_infra_server_group_policies: [anti-affinity]
 
 ## Create a Cinder volume and use it for the OpenShift registry.
 ## NOTE: the openstack credentials and hosted registry options must be set in OSEv3.yml!
-#cinder_hosted_registry_name: cinder-registry
-#cinder_hosted_registry_size_gb: 10
+#openshift_openstack_cinder_hosted_registry_name: cinder-registry
+#openshift_openstack_cinder_hosted_registry_size_gb: 10
 
 ## Set up a filesystem on the cinder volume specified in `OSEv3.yaml`.
 ## You need to specify the file system and volume ID in OSEv3 via
 ## `openshift_hosted_registry_storage_openstack_filesystem` and
 ## `openshift_hosted_registry_storage_openstack_volumeID`.
 ## WARNING: This will delete any data on the volume!
-#prepare_and_format_registry_volume: False
+#openshift_openstack_prepare_and_format_registry_volume: False
 
-openstack_subnet_prefix: "192.168.99"
+openshift_openstack_subnet_prefix: "192.168.99"
 
 ## Red Hat subscription defaults to false which means we will not attempt to
 ## subscribe the nodes
@@ -110,8 +110,8 @@ openstack_subnet_prefix: "192.168.99"
 
 
 # # Roll-your-own DNS
-#openstack_num_dns: 0
-#external_nsupdate_keys:
+#openshift_openstack_num_dns: 0
+#openshift_openstack_external_nsupdate_keys:
 #  public:
 #    key_secret: 'SKqKNdpfk7llKxZ57bbxUnUDobaaJp9t8CjXLJPl+fRI5mPcSBuxTAyvJPa6Y9R7vUg9DwCy/6WTpgLNqnV4Hg=='
 #    key_algorithm: 'hmac-md5'
@@ -131,16 +131,16 @@ openstack_subnet_prefix: "192.168.99"
 ansible_user: openshift
 
 # # Use a single security group for a cluster (default: false)
-#openstack_flat_secgrp: false
+#openshift_openstack_flat_secgrp: false
 
 # If you want to use the VM storage instead of Cinder volumes, set this to `true`.
 # NOTE: this is for testing only! Your data will be gone once the VM disappears!
-# ephemeral_volumes: false
+# openshift_openstack_ephemeral_volumes: false
 
 # # OpenShift node labels
 # # - in order to customise node labels for app and/or infra group, set the
-# #   openshift_cluster_node_labels variable
-#openshift_cluster_node_labels:
+# #   openshift_openstack_cluster_node_labels variable
+#openshift_openstack_cluster_node_labels:
 #  app:
 #    region: primary
 #  infra: