From def5292a85a72ff919930ea7717eaf105a8d4a96 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 11 Dec 2017 13:06:15 +0000 Subject: [PATCH] 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 --- playbooks/ceph-install.yml | 1 - playbooks/etcd-install.yml | 2 -- playbooks/galera-install.yml | 2 -- playbooks/haproxy-install.yml | 4 ---- playbooks/lxc-containers-create.yml | 3 --- playbooks/memcached-install.yml | 2 -- playbooks/os-aodh-install.yml | 1 - playbooks/os-barbican-install.yml | 2 -- playbooks/os-ceilometer-install.yml | 2 -- playbooks/os-designate-install.yml | 2 -- playbooks/os-gnocchi-install.yml | 1 - playbooks/os-heat-install.yml | 1 - playbooks/os-horizon-install.yml | 1 - playbooks/os-ironic-install.yml | 1 - playbooks/os-magnum-install.yml | 2 -- playbooks/os-molteniron-install.yml | 2 -- playbooks/os-octavia-install.yml | 1 - playbooks/os-sahara-install.yml | 2 -- playbooks/os-swift-install.yml | 2 -- playbooks/os-swift-sync.yml | 2 -- playbooks/os-tacker-install.yml | 1 - playbooks/os-tempest-install.yml | 2 -- playbooks/os-trove-install.yml | 2 -- playbooks/rabbitmq-install.yml | 2 -- playbooks/repo-server.yml | 2 -- playbooks/rsyslog-install.yml | 2 -- playbooks/unbound-install.yml | 2 -- playbooks/utility-install.yml | 2 -- 28 files changed, 51 deletions(-) diff --git a/playbooks/ceph-install.yml b/playbooks/ceph-install.yml index eb71b2b2df..8a573cb2d5 100644 --- 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: diff --git a/playbooks/etcd-install.yml b/playbooks/etcd-install.yml index b8ca67c3e8..963d69d4c1 100644 --- 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({}) }}" diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index a23c613bec..f1b4fa3523 100644 --- 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 diff --git a/playbooks/haproxy-install.yml b/playbooks/haproxy-install.yml index 4fe84c5477..7dbe610ec5 100644 --- 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 diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml index c869a7547b..9b7ae59527 100644 --- 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: diff --git a/playbooks/memcached-install.yml b/playbooks/memcached-install.yml index 95559c9a42..d9feb7abc3 100644 --- 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 diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index f68aafc2a7..f5d9859b5a 100644 --- 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 }}" diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index e3ba5837c5..5b0b899506 100644 --- 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 diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 1bb42e48ae..301ebc5beb 100644 --- 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 diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index 54cf31fc47..585bb261b3 100644 --- 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 diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml index f73a5b6393..ba9b906a37 100644 --- 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 }}" diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index 2a768c4b89..18f9c0ac3c 100644 --- 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 }}" diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 4c17dd0eb2..956d796e32 100644 --- 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 }}" diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index 3dda03db7d..d78f0e88f5 100644 --- 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 }}" diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index ba7fa639dc..f87b0779f7 100644 --- 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" diff --git a/playbooks/os-molteniron-install.yml b/playbooks/os-molteniron-install.yml index ff820f7b62..f535634c46 100644 --- 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 diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml index 17ca53480a..0b7d03a6a5 100644 --- 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 }}" diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml index 7ced0e93be..265a1a03be 100644 --- 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 diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index 5c1df366f3..09a5382c5b 100644 --- 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 diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml index bd7b4d4ff8..8af0bade67 100644 --- 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 diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml index b35ea18b69..d0fc4bd4f5 100644 --- 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: diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index c438358044..c56d1b13a9 100644 --- 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 diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index 3e0462eaf1..e7bdaae4eb 100644 --- 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 diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 748c404f28..b9f58a97e6 100644 --- 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 diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml index d1ec5ba92a..9e61bc6a03 100644 --- 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 diff --git a/playbooks/rsyslog-install.yml b/playbooks/rsyslog-install.yml index 74d72c73c9..44e517bcc1 100644 --- 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 diff --git a/playbooks/unbound-install.yml b/playbooks/unbound-install.yml index 2b8d09bd39..427abf7d56 100644 --- 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: diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index 0f7d29a98b..9f252e1231 100644 --- 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