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
This commit is contained in:
parent
7b3aac28a0
commit
def5292a85
@ -116,7 +116,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- crontab
|
- crontab
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
ansible_python_interpreter: "/usr/bin/python"
|
ansible_python_interpreter: "/usr/bin/python"
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
|
@ -31,6 +31,4 @@
|
|||||||
tags:
|
tags:
|
||||||
- etcd-server
|
- etcd-server
|
||||||
- role: "system_crontab_coordination"
|
- role: "system_crontab_coordination"
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
|
@ -35,8 +35,6 @@
|
|||||||
when:
|
when:
|
||||||
- hostvars['localhost']['resolvconf_enabled'] | bool
|
- hostvars['localhost']['resolvconf_enabled'] | bool
|
||||||
- include: common-tasks/package-cache-proxy.yml
|
- include: common-tasks/package-cache-proxy.yml
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- galera
|
- galera
|
||||||
|
@ -33,8 +33,6 @@
|
|||||||
when: haproxy_use_keepalived | bool
|
when: haproxy_use_keepalived | bool
|
||||||
tags:
|
tags:
|
||||||
- keepalived
|
- keepalived
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- haproxy-config
|
- haproxy-config
|
||||||
@ -72,8 +70,6 @@
|
|||||||
- rsyslog
|
- rsyslog
|
||||||
post_tasks:
|
post_tasks:
|
||||||
- include: common-tasks/package-cache-proxy.yml
|
- include: common-tasks/package-cache-proxy.yml
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- haproxy
|
- haproxy
|
||||||
|
@ -35,8 +35,6 @@
|
|||||||
setup:
|
setup:
|
||||||
filter: ansible_local
|
filter: ansible_local
|
||||||
gather_subset: "!all"
|
gather_subset: "!all"
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- lxc-containers-create
|
- lxc-containers-create
|
||||||
@ -50,7 +48,6 @@
|
|||||||
roles:
|
roles:
|
||||||
- role: "openstack_hosts"
|
- role: "openstack_hosts"
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
host_need_pip: False
|
host_need_pip: False
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
|
@ -41,8 +41,6 @@
|
|||||||
- role: "system_crontab_coordination"
|
- role: "system_crontab_coordination"
|
||||||
tags:
|
tags:
|
||||||
- crontab
|
- crontab
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- memcached
|
- memcached
|
||||||
|
@ -60,7 +60,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
aodh_rabbitmq_userid: aodh
|
aodh_rabbitmq_userid: aodh
|
||||||
aodh_rabbitmq_vhost: /aodh
|
aodh_rabbitmq_vhost: /aodh
|
||||||
aodh_rabbitmq_servers: "{{ rabbitmq_servers }}"
|
aodh_rabbitmq_servers: "{{ rabbitmq_servers }}"
|
||||||
|
@ -59,8 +59,6 @@
|
|||||||
rsyslog_client_config_name: "99-barbican-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-barbican-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- barbican
|
- barbican
|
||||||
|
@ -51,8 +51,6 @@
|
|||||||
rsyslog_client_config_name: "99-ceilometer-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-ceilometer-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- ceilometer
|
- ceilometer
|
||||||
|
@ -74,8 +74,6 @@
|
|||||||
rsyslog_client_config_name: "99-designate-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-designate-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- designate
|
- designate
|
||||||
|
@ -66,7 +66,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
gnocchi_galera_user: gnocchi
|
gnocchi_galera_user: gnocchi
|
||||||
gnocchi_galera_database: gnocchi
|
gnocchi_galera_database: gnocchi
|
||||||
gnocchi_galera_address: "{{ galera_address }}"
|
gnocchi_galera_address: "{{ galera_address }}"
|
||||||
|
@ -75,7 +75,6 @@
|
|||||||
vars_files:
|
vars_files:
|
||||||
- defaults/repo_packages/openstack_services.yml
|
- defaults/repo_packages/openstack_services.yml
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
heat_galera_user: heat
|
heat_galera_user: heat
|
||||||
heat_galera_database: heat
|
heat_galera_database: heat
|
||||||
heat_galera_address: "{{ galera_address }}"
|
heat_galera_address: "{{ galera_address }}"
|
||||||
|
@ -50,7 +50,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- crontab
|
- crontab
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
horizon_galera_user: horizon
|
horizon_galera_user: horizon
|
||||||
horizon_galera_database: horizon
|
horizon_galera_database: horizon
|
||||||
horizon_galera_address: "{{ galera_address }}"
|
horizon_galera_address: "{{ galera_address }}"
|
||||||
|
@ -57,7 +57,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- crontab
|
- crontab
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
ironic_galera_user: ironic
|
ironic_galera_user: ironic
|
||||||
ironic_galera_database: ironic
|
ironic_galera_database: ironic
|
||||||
ironic_galera_address: "{{ galera_address }}"
|
ironic_galera_address: "{{ galera_address }}"
|
||||||
|
@ -60,8 +60,6 @@
|
|||||||
rsyslog_client_config_name: "99-magnum-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-magnum-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- "magnum"
|
- "magnum"
|
||||||
|
@ -49,8 +49,6 @@
|
|||||||
- role: "system_crontab_coordination"
|
- role: "system_crontab_coordination"
|
||||||
tags:
|
tags:
|
||||||
- crontab
|
- crontab
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- molteniron
|
- molteniron
|
||||||
|
@ -64,7 +64,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- crontab
|
- crontab
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
octavia_galera_user: octavia
|
octavia_galera_user: octavia
|
||||||
octavia_galera_database: octavia
|
octavia_galera_database: octavia
|
||||||
octavia_galera_address: "{{ galera_address }}"
|
octavia_galera_address: "{{ galera_address }}"
|
||||||
|
@ -69,8 +69,6 @@
|
|||||||
rsyslog_client_config_name: "99-sahara-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-sahara-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- sahara
|
- sahara
|
||||||
|
@ -55,8 +55,6 @@
|
|||||||
- role: "os_swift"
|
- role: "os_swift"
|
||||||
swift_do_setup: True
|
swift_do_setup: True
|
||||||
swift_do_sync: True
|
swift_do_sync: True
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- swift
|
- swift
|
||||||
|
@ -24,8 +24,6 @@
|
|||||||
- role: "os_swift"
|
- role: "os_swift"
|
||||||
swift_do_setup: False
|
swift_do_setup: False
|
||||||
swift_do_sync: True
|
swift_do_sync: True
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- swift
|
- swift
|
||||||
|
@ -56,7 +56,6 @@
|
|||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
vars:
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
tacker_galera_address: "{{ internal_lb_vip_address }}"
|
tacker_galera_address: "{{ internal_lb_vip_address }}"
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
|
@ -31,8 +31,6 @@
|
|||||||
- crontab
|
- crontab
|
||||||
vars_files:
|
vars_files:
|
||||||
- defaults/repo_packages/openstack_testing.yml
|
- defaults/repo_packages/openstack_testing.yml
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- tempest
|
- tempest
|
||||||
|
@ -74,8 +74,6 @@
|
|||||||
rsyslog_client_config_name: "99-trove-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-trove-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- trove
|
- trove
|
||||||
|
@ -32,8 +32,6 @@
|
|||||||
- include: common-tasks/package-cache-proxy.yml
|
- include: common-tasks/package-cache-proxy.yml
|
||||||
roles:
|
roles:
|
||||||
- role: "system_crontab_coordination"
|
- role: "system_crontab_coordination"
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- rabbitmq
|
- rabbitmq
|
||||||
|
@ -82,8 +82,6 @@
|
|||||||
|
|
||||||
vars_files:
|
vars_files:
|
||||||
- defaults/repo_packages/openstack_services.yml
|
- defaults/repo_packages/openstack_services.yml
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- repo-server
|
- repo-server
|
||||||
|
@ -38,8 +38,6 @@
|
|||||||
- role: "system_crontab_coordination"
|
- role: "system_crontab_coordination"
|
||||||
tags:
|
tags:
|
||||||
- crontab
|
- crontab
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
|
@ -31,8 +31,6 @@
|
|||||||
- "system-crontab-coordination"
|
- "system-crontab-coordination"
|
||||||
vars_files:
|
vars_files:
|
||||||
- defaults/repo_packages/openstack_services.yml
|
- defaults/repo_packages/openstack_services.yml
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
|
|
||||||
- name: Install unbound DNS resolver client configurations
|
- name: Install unbound DNS resolver client configurations
|
||||||
hosts:
|
hosts:
|
||||||
|
@ -86,8 +86,6 @@
|
|||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
when: utility_ssh_private_key is defined
|
when: utility_ssh_private_key is defined
|
||||||
vars:
|
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
|
||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
tags:
|
tags:
|
||||||
- utility
|
- utility
|
||||||
|
Loading…
x
Reference in New Issue
Block a user