Remove is_metal from playbooks

The is_metal variable is set in group_vars/all/all.yml so it does not need to also be set in every playbook. Change-Id: I9a2337f0e2b908a59e8d0f3cddf2b61cc48a49a8
2017-12-11 13:06:15 +00:00 · 2017-12-11 13:06:15 +00:00 · def5292a85
commit def5292a85
parent 7b3aac28a0
28 changed files with 0 additions and 51 deletions
--- a/playbooks/ceph-install.yml
+++ b/playbooks/ceph-install.yml
@ -116,7 +116,6 @@
      tags:
        - crontab
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    ansible_python_interpreter: "/usr/bin/python"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
--- a/playbooks/etcd-install.yml
+++ b/playbooks/etcd-install.yml
@ -31,6 +31,4 @@
      tags:
        - etcd-server
    - role: "system_crontab_coordination"
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
--- a/playbooks/galera-install.yml
+++ b/playbooks/galera-install.yml
@ -35,8 +35,6 @@
      when:
        - hostvars['localhost']['resolvconf_enabled'] | bool
    - include: common-tasks/package-cache-proxy.yml
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - galera
--- a/playbooks/haproxy-install.yml
+++ b/playbooks/haproxy-install.yml
@ -33,8 +33,6 @@
      when: haproxy_use_keepalived | bool
      tags:
        - keepalived
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - haproxy-config
@ -72,8 +70,6 @@
        - rsyslog
  post_tasks:
    - include: common-tasks/package-cache-proxy.yml
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - haproxy
--- a/playbooks/lxc-containers-create.yml
+++ b/playbooks/lxc-containers-create.yml
@ -35,8 +35,6 @@
      setup:
        filter: ansible_local
        gather_subset: "!all"
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - lxc-containers-create
@ -50,7 +48,6 @@
  roles:
    - role: "openstack_hosts"
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    host_need_pip: False
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
--- a/playbooks/memcached-install.yml
+++ b/playbooks/memcached-install.yml
@ -41,8 +41,6 @@
    - role: "system_crontab_coordination"
      tags:
        - crontab
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - memcached
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@ -60,7 +60,6 @@
      tags:
        - rsyslog
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    aodh_rabbitmq_userid: aodh
    aodh_rabbitmq_vhost: /aodh
    aodh_rabbitmq_servers: "{{ rabbitmq_servers }}"
--- a/playbooks/os-barbican-install.yml
+++ b/playbooks/os-barbican-install.yml
@ -59,8 +59,6 @@
      rsyslog_client_config_name: "99-barbican-rsyslog-client.conf"
      tags:
        - rsyslog
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - barbican
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@ -51,8 +51,6 @@
      rsyslog_client_config_name: "99-ceilometer-rsyslog-client.conf"
      tags:
        - rsyslog
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - ceilometer
--- a/playbooks/os-designate-install.yml
+++ b/playbooks/os-designate-install.yml
@ -74,8 +74,6 @@
      rsyslog_client_config_name: "99-designate-rsyslog-client.conf"
      tags:
        - rsyslog
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - designate
--- a/playbooks/os-gnocchi-install.yml
+++ b/playbooks/os-gnocchi-install.yml
@ -66,7 +66,6 @@
      tags:
        - rsyslog
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    gnocchi_galera_user: gnocchi
    gnocchi_galera_database: gnocchi
    gnocchi_galera_address: "{{ galera_address }}"
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@ -75,7 +75,6 @@
  vars_files:
    - defaults/repo_packages/openstack_services.yml
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    heat_galera_user: heat
    heat_galera_database: heat
    heat_galera_address: "{{ galera_address }}"
--- a/playbooks/os-horizon-install.yml
+++ b/playbooks/os-horizon-install.yml
@ -50,7 +50,6 @@
      tags:
        - crontab
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    horizon_galera_user: horizon
    horizon_galera_database: horizon
    horizon_galera_address: "{{ galera_address }}"
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@ -57,7 +57,6 @@
      tags:
        - crontab
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    ironic_galera_user: ironic
    ironic_galera_database: ironic
    ironic_galera_address: "{{ galera_address }}"
--- a/playbooks/os-magnum-install.yml
+++ b/playbooks/os-magnum-install.yml
@ -60,8 +60,6 @@
      rsyslog_client_config_name: "99-magnum-rsyslog-client.conf"
      tags:
        - rsyslog
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - "magnum"
--- a/playbooks/os-molteniron-install.yml
+++ b/playbooks/os-molteniron-install.yml
@ -49,8 +49,6 @@
    - role: "system_crontab_coordination"
      tags:
        - crontab
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - molteniron
--- a/playbooks/os-octavia-install.yml
+++ b/playbooks/os-octavia-install.yml
@ -64,7 +64,6 @@
      tags:
        - crontab
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    octavia_galera_user: octavia
    octavia_galera_database: octavia
    octavia_galera_address: "{{ galera_address }}"
--- a/playbooks/os-sahara-install.yml
+++ b/playbooks/os-sahara-install.yml
@ -69,8 +69,6 @@
      rsyslog_client_config_name: "99-sahara-rsyslog-client.conf"
      tags:
        - rsyslog
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - sahara
--- a/playbooks/os-swift-install.yml
+++ b/playbooks/os-swift-install.yml
@ -55,8 +55,6 @@
    - role: "os_swift"
      swift_do_setup: True
      swift_do_sync: True
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - swift
--- a/playbooks/os-swift-sync.yml
+++ b/playbooks/os-swift-sync.yml
@ -24,8 +24,6 @@
    - role: "os_swift"
      swift_do_setup: False
      swift_do_sync: True
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - swift
--- a/playbooks/os-tacker-install.yml
+++ b/playbooks/os-tacker-install.yml
@ -56,7 +56,6 @@
      tags:
        - rsyslog
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
    tacker_galera_address: "{{ internal_lb_vip_address }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@ -31,8 +31,6 @@
        - crontab
  vars_files:
    - defaults/repo_packages/openstack_testing.yml
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - tempest
--- a/playbooks/os-trove-install.yml
+++ b/playbooks/os-trove-install.yml
@ -74,8 +74,6 @@
      rsyslog_client_config_name: "99-trove-rsyslog-client.conf"
      tags:
        - rsyslog
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - trove
--- a/playbooks/rabbitmq-install.yml
+++ b/playbooks/rabbitmq-install.yml
@ -32,8 +32,6 @@
    - include: common-tasks/package-cache-proxy.yml
  roles:
    - role: "system_crontab_coordination"
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - rabbitmq
--- a/playbooks/repo-server.yml
+++ b/playbooks/repo-server.yml
@ -82,8 +82,6 @@

  vars_files:
    - defaults/repo_packages/openstack_services.yml
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - repo-server
--- a/playbooks/rsyslog-install.yml
+++ b/playbooks/rsyslog-install.yml
@ -38,8 +38,6 @@
    - role: "system_crontab_coordination"
      tags:
        - crontab
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - rsyslog
--- a/playbooks/unbound-install.yml
+++ b/playbooks/unbound-install.yml
@ -31,8 +31,6 @@
        - "system-crontab-coordination"
  vars_files:
    - defaults/repo_packages/openstack_services.yml
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"

 - name: Install unbound DNS resolver client configurations
  hosts:
--- a/playbooks/utility-install.yml
+++ b/playbooks/utility-install.yml
@ -86,8 +86,6 @@
        owner: root
        group: root
      when: utility_ssh_private_key is defined
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
  environment: "{{ deployment_environment_variables | default({}) }}"
  tags:
    - utility