Merge "use include_tasks instead of include"
This commit is contained in:
commit
53469ef169
|
@ -24,9 +24,9 @@
|
||||||
tags:
|
tags:
|
||||||
- monasca
|
- monasca
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
- include: common-tasks/os-lxc-container-setup.yml
|
- include_tasks: common-tasks/os-lxc-container-setup.yml
|
||||||
|
|
||||||
- include: common-tasks/os-log-dir-setup.yml
|
- include_tasks: common-tasks/os-log-dir-setup.yml
|
||||||
vars:
|
vars:
|
||||||
log_dirs:
|
log_dirs:
|
||||||
- src: "/openstack/log/{{ inventory_hostname }}-monasca"
|
- src: "/openstack/log/{{ inventory_hostname }}-monasca"
|
||||||
|
|
|
@ -28,36 +28,36 @@
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
|
||||||
- include: monasca_pre_install.yml
|
- include_tasks: monasca_pre_install.yml
|
||||||
when: inventory_hostname in groups['monasca_api']
|
when: inventory_hostname in groups['monasca_api']
|
||||||
tags:
|
tags:
|
||||||
- monasca-install
|
- monasca-install
|
||||||
|
|
||||||
- include: monasca_install.yml
|
- include_tasks: monasca_install.yml
|
||||||
when: inventory_hostname in groups['monasca_api']
|
when: inventory_hostname in groups['monasca_api']
|
||||||
tags:
|
tags:
|
||||||
- monasca-install
|
- monasca-install
|
||||||
|
|
||||||
- include: monasca_thresh_install.yml
|
- include_tasks: monasca_thresh_install.yml
|
||||||
when: inventory_hostname in groups['monasca_api']
|
when: inventory_hostname in groups['monasca_api']
|
||||||
tags:
|
tags:
|
||||||
- monasca-install
|
- monasca-install
|
||||||
|
|
||||||
- include: monasca_post_install.yml
|
- include_tasks: monasca_post_install.yml
|
||||||
when: inventory_hostname in groups['monasca_api']
|
when: inventory_hostname in groups['monasca_api']
|
||||||
tags:
|
tags:
|
||||||
- monasca-config
|
- monasca-config
|
||||||
|
|
||||||
- include: monasca_init_{{ ansible_service_mgr }}.yml
|
- include_tasks: monasca_init_{{ ansible_service_mgr }}.yml
|
||||||
when: inventory_hostname in groups['monasca_api']
|
when: inventory_hostname in groups['monasca_api']
|
||||||
tags:
|
tags:
|
||||||
- monasca-config
|
- monasca-config
|
||||||
|
|
||||||
- include: monasca_db_setup.yml
|
- include_tasks: monasca_db_setup.yml
|
||||||
tags:
|
tags:
|
||||||
- monasca-config
|
- monasca-config
|
||||||
|
|
||||||
- include: monasca_service_setup.yml
|
- include_tasks: monasca_service_setup.yml
|
||||||
when: inventory_hostname == groups['monasca_api'][0]
|
when: inventory_hostname == groups['monasca_api'][0]
|
||||||
tags:
|
tags:
|
||||||
- monasca-config
|
- monasca-config
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
- name: Flush handlers
|
- name: Flush handlers
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
|
|
||||||
- include: monasca_alarms_setup.yml
|
- include_tasks: monasca_alarms_setup.yml
|
||||||
when: inventory_hostname == groups['monasca_api'][0]
|
when: inventory_hostname == groups['monasca_api'][0]
|
||||||
tags:
|
tags:
|
||||||
- monasca-alarms
|
- monasca-alarms
|
||||||
|
|
|
@ -11,13 +11,13 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
- include: monasca_influxdb_setup.yml
|
- include_tasks: monasca_influxdb_setup.yml
|
||||||
when: inventory_hostname in groups['monasca_api']
|
when: inventory_hostname in groups['monasca_api']
|
||||||
vars:
|
vars:
|
||||||
ansible_python_interpreter: "{{ monasca_bin }}/python"
|
ansible_python_interpreter: "{{ monasca_bin }}/python"
|
||||||
|
|
||||||
- include: monasca_mysql_setup.yml
|
- include_tasks: monasca_mysql_setup.yml
|
||||||
when: inventory_hostname in groups['monasca_api']
|
when: inventory_hostname in groups['monasca_api']
|
||||||
|
|
||||||
- include: monasca_kafka_setup.yml
|
- include_tasks: monasca_kafka_setup.yml
|
||||||
when: inventory_hostname in groups['monasca_kafka']
|
when: inventory_hostname in groups['monasca_kafka']
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
|
# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
|
||||||
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
|
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
|
||||||
|
|
||||||
- include: "{{ playbook_dir }}/../examples/monasca-dependencies.yml"
|
- import_playbook: "{{ playbook_dir }}/../examples/monasca-dependencies.yml"
|
||||||
|
|
||||||
- name: Install monasca server
|
- name: Install monasca server
|
||||||
hosts: monasca_all
|
hosts: monasca_all
|
||||||
|
|
|
@ -17,16 +17,16 @@
|
||||||
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
|
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
|
||||||
|
|
||||||
# Setup the host
|
# Setup the host
|
||||||
- include: common/test-setup-host.yml
|
- import_playbook: common/test-setup-host.yml
|
||||||
|
|
||||||
# Install RabbitMQ/MariaDB
|
# Install RabbitMQ/MariaDB
|
||||||
- include: common/test-install-infra.yml
|
- import_playbook: common/test-install-infra.yml
|
||||||
|
|
||||||
# Install keystone
|
# Install keystone
|
||||||
- include: common/test-install-keystone.yml
|
- import_playbook: common/test-install-keystone.yml
|
||||||
|
|
||||||
# Install monasca
|
# Install monasca
|
||||||
- include: test-install-monasca.yml
|
- import_playbook: test-install-monasca.yml
|
||||||
|
|
||||||
# Install tempest
|
# Install tempest
|
||||||
- include: common/test-install-tempest.yml
|
- import_playbook: common/test-install-tempest.yml
|
||||||
|
|
Loading…
Reference in New Issue