Merge "Remove unneeded playbook vars"

playbooks/galera-install.yml

@@ -82,6 +82,5 @@
     galera_server_id: "{{ inventory_hostname | string_2_int }}"
     galera_wsrep_node_name: "{{ container_name }}"
     galera_lb_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
   tags:
     - galera-install-cluster

playbooks/lxc-containers-create.yml

@@ -31,6 +31,5 @@
       tags:
         - lxc-container-wait-for-ssh
   vars:
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     lxc_container_release: "{{ properties.container_release|default('trusty') }}"

playbooks/os-aodh-install.yml

@@ -74,5 +74,4 @@
       tags:
         - "aodh-rsyslog-client"
   vars:
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/os-ceilometer-install.yml

@@ -86,5 +86,4 @@
         - "ceilometer-rsyslog-client"
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/os-cinder-install.yml

@@ -181,6 +181,4 @@
         - "system-crontab-coordination"
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
-

playbooks/os-glance-install.yml

@@ -113,5 +113,4 @@
         - "system-crontab-coordination"
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/os-heat-install.yml

@@ -90,7 +90,6 @@
         - "system-crontab-coordination"
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
   vars_files:
     - defaults/repo_packages/openstack_services.yml

playbooks/os-horizon-install.yml

@@ -91,5 +91,4 @@
         - "system-crontab-coordination"
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/os-keystone-install.yml

@@ -109,6 +109,5 @@
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
     keystone_admin_port: 35357
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
 

playbooks/os-neutron-install.yml

@@ -148,6 +148,5 @@
         - "system-crontab-coordination"
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     bind_prefix: "{{ provider_network_bind_prefix|default('') }}"

playbooks/os-nova-install.yml

@@ -178,7 +178,5 @@
     - defaults/repo_packages/openstack_other.yml
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
-    ansible_ssh_host: "{{ container_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     glance_host: "{{ internal_lb_vip_address }}"

playbooks/os-swift-setup.yml

@@ -149,6 +149,4 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    ansible_hostname: "{{ container_name }}"
-    ansible_ssh_host: "{{ container_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/os-swift-sync.yml

@@ -25,6 +25,4 @@
       tags:
         - "os-swift-sync"
   vars:
-    ansible_hostname: "{{ container_name }}"
-    ansible_ssh_host: "{{ container_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/rabbitmq-install.yml

@@ -59,6 +59,4 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    ansible_hostname: "{{ container_name }}"
-    ansible_ssh_host: "{{ container_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/repo-server.yml

@@ -75,5 +75,4 @@
         - "rsyslog-client"
   vars:
     pip_no_index: false
-    ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"

playbooks/utility-install.yml

@@ -112,8 +112,6 @@
         group: root
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
-    ansible_hostname: "{{ container_name }}"
-    ansible_ssh_host: "{{ container_address }}"
     utility_pip_packages:
       - python-openstackclient
       - python-ceilometerclient