Remove snet hosts file hack

A previous commit overlooked the fact that glance exposes
swift_store_endpoint_type, which allows us to use specify publicURL,
internalURL, etc.  This change leverages that configuration option
which makes this change more generic so it can be used with other
non-RS swift installations.

etc/rpc_deploy/user_variables.yml

@@ -62,7 +62,7 @@ glance_swift_store_user: "{{ rackspace_cloud_tenant_id }}:{{ rackspace_cloud_use
 glance_swift_store_key: "{{ rackspace_cloud_password }}"
 glance_swift_store_container: SomeContainerName
 glance_swift_store_region: SomeRegion
-glance_swift_enable_snet: True
+glance_swift_store_endpoint_type: internalURL
 
 
 ## Heat Options

rpc_deployment/inventory/group_vars/glance_all.yml

@@ -95,23 +95,3 @@ container_directories:
 
 container_packages:
   - rsync
-
-cf_snet_endpoints:
-  DFW:
-    hostname: storage101.dfw1.clouddrive.com
-    ip: 10.191.208.30
-  HKG:
-    hostname: storage101.hkg1.clouddrive.com
-    ip: 10.191.208.34
-  IAD:
-    hostname: storage101.iad3.clouddrive.com
-    ip: 10.191.208.34
-  LON:
-    hostname: storage101.lon3.clouddrive.com
-    ip: 10.191.209.30
-  ORD:
-    hostname: storage101.ord1.clouddrive.com
-    ip: 10.191.208.30
-  SYD:
-    hostname: storage101.syd2.clouddrive.com
-    ip: 10.191.208.34

rpc_deployment/playbooks/openstack/glance-api.yml

@@ -22,7 +22,6 @@
     - openstack_common
     - openstack_openrc
     - galera_client_cnf
-    - glance_snet_override
   vars_files:
     - vars/openstack_service_vars/glance_api.yml
 

rpc_deployment/playbooks/openstack/glance-registry.yml

@@ -25,7 +25,6 @@
     - openstack_openrc
     - galera_client_cnf
     - init_script
-    - glance_snet_override
   vars_files:
     - vars/config_vars/glance_config.yml
     - vars/openstack_service_vars/glance_registry.yml

rpc_deployment/roles/glance_snet_override/tasks/main.yml

@@ -1,13 +0,0 @@
----
-- name: Add hosts entry if glance_swift_enable_snet is True
-  lineinfile:
-    dest: /etc/hosts
-    regexp: "{{ cf_snet_endpoints[glance_swift_store_region]['hostname'] }}"
-    line: "{{ cf_snet_endpoints[glance_swift_store_region]['ip'] }} {{ cf_snet_endpoints[glance_swift_store_region]['hostname'] }}"
-  when: glance_swift_enable_snet
-- name: Remove hosts entry if glance_swift_enable_snet is False
-  lineinfile:
-    dest: /etc/hosts
-    regexp: "{{ cf_snet_endpoints[glance_swift_store_region]['hostname'] }}"
-    state: absent
-  when: not glance_swift_enable_snet

rpc_deployment/vars/config_vars/glance_config.yml

@@ -55,7 +55,7 @@ glance_api_conf:
     swift_store_large_object_size: 5120
     swift_store_large_object_chunk_size: 200
     swift_store_retry_get_count: 5
-    swift_enable_snet: "{{ glance_swift_enable_snet }}"
+    swift_store_endpoint_type: "{{ glance_swift_store_endpoint_type }}"
 
     filesystem_store_datadir: /var/lib/glance/images/
     delayed_delete: False