x
/
browbeat
Code Issues Proposed changes

Merge "Update location of CI variables"

This commit is contained in:
Jenkins 2017-02-03 13:13:36 +00:00 committed by Gerrit Code Review
parent 918034a587 90bb494647
commit 6418587837
8 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/oooq/roles/bug-check/tasks/main.yml
View File

@ -6,7 +6,6 @@
shell:
"cd {{ ansible_env.HOME }}/browbeat/ansible; \
ansible-playbook -i hosts \
--extra-vars @{{ ansible_env.HOME }}/browbeat/ci-scripts/config/tripleo/oooq/all.yml \
check/site.yml > {{ ansible_env.HOME }}/browbeat/results/check.log"
register: check_run
ignore_errors: true

1
ansible/oooq/roles/collectd-undercloud/tasks/main.yml
View File

@ -15,7 +15,6 @@
--extra-vars graphite_host={{ graphite_host_template }} \
--extra-vars graphite_prefix={{ graphite_prefix_template }} \
install/collectd-openstack.yml \
--extra-vars @{{ ansible_env.HOME }}/browbeat/ci-scripts/config/tripleo/oooq/all.yml \
> {{ ansible_env.HOME }}/browbeat/results/collecd_install.log"
register: collectd_install
until: collectd_install.rc == 0

1
ansible/oooq/roles/collectd/tasks/main.yml
View File

@ -8,7 +8,6 @@
--extra-vars collectd_compute=true \
--extra-vars graphite_host={{ graphite_host_template }} \
--extra-vars graphite_prefix={{ graphite_prefix_template }} \
--extra-vars @{{ ansible_env.HOME }}/browbeat/ci-scripts/config/tripleo/oooq/all.yml \
install/collectd-openstack.yml \
> {{ ansible_env.HOME }}/browbeat/results/collecd_install.log"
register: collectd_install

1
ansible/oooq/roles/gather-metadata/tasks/main.yml
View File

@ -6,7 +6,6 @@
shell:
"cd {{ ansible_env.HOME }}/browbeat/ansible; \
ansible-playbook -i hosts \
--extra-vars @{{ ansible_env.HOME }}/browbeat/ci-scripts/config/tripleo/oooq/all.yml \
gather/site.yml > {{ ansible_env.HOME }}/browbeat/results/metadata.log"
register: metadata_run
until: metadata_run.rc == 0

1
ansible/oooq/roles/grafana-dashboard-setup/tasks/main.yml
View File

@ -11,7 +11,6 @@
--extra-vars grafana_username={{ grafana_username_template }} \
--extra-vars grafana_password={{ grafana_password_template }} \
--extra-vars dashboard_cloud_name={{ graphite_prefix_template }} \
--extra-vars @{{ ansible_env.HOME }}/browbeat/ci-scripts/config/tripleo/oooq/all.yml \
install/grafana-dashboards.yml > {{ ansible_env.HOME }}/browbeat/results/dashboards.log"
environment:
ANSIBLE_SSH_ARGS: "-F {{ ansible_env.HOME }}/browbeat/ansible/ssh-config"

2
ansible/oooq/roles/pre-install-setup/tasks/main.yml
View File

@ -21,7 +21,7 @@
- name: Fetch CI vars file
fetch:
"src={{ ansible_env.HOME }}/browbeat/ci-scripts/config/tripleo/oooq/all.yml \
"src={{ lookup('env','HW_ENV_DIR') }}/all.yml \
dest=/tmp/install_vars.yml \
flat=yes"

4
ci-scripts/README.rst
View File

@ -153,7 +153,9 @@ serious benchmarking.
To run the baremetal CI follow the requisite steps to setup a hardware
environment (this is nontrival) then create a workspace folder and clone
TripleO Quickstart and Browbeat into that workspace. Set the variables below
and then run ``microbrow.sh``.
and then run ``microbrow.sh``. There must be an all.yml file in the HW_ENV
directory for overriding some browbeat variables with ones specific to the CI
environment.
::

8
ci-scripts/config/tripleo/oooq/all.yml
View File

@ -1,8 +0,0 @@
#variables to override for Browbeat install
dns_server: 192.168.23.1
disable_ssh_dns: true
browbeat_pub_subnet: 192.0.2.0/24
browbeat_pub_pool_start: 192.0.2.100
browbeat_pub_pool_end: 192.0.2.200
browbeat_pub_pool_gw: 192.0.2.1
browbeat_pri_pool_dns: 192.168.23.1