From bcbc5b27fce24bee069f63cc5a061548708a0519 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Sun, 10 Jan 2016 16:49:26 -0800 Subject: [PATCH] Remove unneeded playbook vars ansible_hostname is not used within any tasks and, by default, is the same value as container_name. ansible_ssh_host and container_address are also the same value by default, both are assigned to hosts through the dynamic inventory script. Additionally, overriding ansible_ssh_host through playbook vars breaks tasks that delegate to other hosts when using Ansible2. Change-Id: I2525b476c9302ef37f29e2beb132856232d129e2 --- playbooks/galera-install.yml | 1 - playbooks/lxc-containers-create.yml | 1 - playbooks/os-aodh-install.yml | 1 - playbooks/os-ceilometer-install.yml | 1 - playbooks/os-cinder-install.yml | 2 -- playbooks/os-glance-install.yml | 1 - playbooks/os-heat-install.yml | 1 - playbooks/os-horizon-install.yml | 1 - playbooks/os-keystone-install.yml | 1 - playbooks/os-neutron-install.yml | 1 - playbooks/os-nova-install.yml | 2 -- playbooks/os-swift-setup.yml | 2 -- playbooks/os-swift-sync.yml | 2 -- playbooks/rabbitmq-install.yml | 2 -- playbooks/repo-server.yml | 1 - playbooks/utility-install.yml | 2 -- 16 files changed, 22 deletions(-) diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index 51ea8a2784..3ffedbb4ae 100644 --- a/playbooks/galera-install.yml +++ b/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 diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml index 97c06f6321..7ef0a661be 100644 --- a/playbooks/lxc-containers-create.yml +++ b/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') }}" diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 7618252e76..cec6581b82 100644 --- a/playbooks/os-aodh-install.yml +++ b/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) }}" diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 815b428123..88e5e85c23 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/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) }}" diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index be37b9dfdc..1eeeb56e32 100644 --- a/playbooks/os-cinder-install.yml +++ b/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) }}" - diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index cf5698c7b8..3c0f7a9f44 100644 --- a/playbooks/os-glance-install.yml +++ b/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) }}" diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index dd7fdb40f5..d539d67772 100644 --- a/playbooks/os-heat-install.yml +++ b/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 diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index bfeda08371..06ef43b54a 100644 --- a/playbooks/os-horizon-install.yml +++ b/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) }}" diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 46fa2ce1c2..ac9199284e 100644 --- a/playbooks/os-keystone-install.yml +++ b/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) }}" diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 228ec74a63..ef1a37ce99 100644 --- a/playbooks/os-neutron-install.yml +++ b/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('') }}" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index e1bcb0197c..00cf2f44da 100644 --- a/playbooks/os-nova-install.yml +++ b/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 }}" diff --git a/playbooks/os-swift-setup.yml b/playbooks/os-swift-setup.yml index 5a1442d452..236e689165 100644 --- a/playbooks/os-swift-setup.yml +++ b/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) }}" diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml index 15ccdd9774..aa5ffedae4 100644 --- a/playbooks/os-swift-sync.yml +++ b/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) }}" diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 5de1b8e650..b74144e918 100644 --- a/playbooks/rabbitmq-install.yml +++ b/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) }}" diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml index b67d696747..366a68b637 100644 --- a/playbooks/repo-server.yml +++ b/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) }}" diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index b8d064e681..3fd1dcdfad 100644 --- a/playbooks/utility-install.yml +++ b/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