From 90bb4946470f0d47debce3c7ad20a1e2efa75adb Mon Sep 17 00:00:00 2001 From: Sai Sindhur Malleni Date: Mon, 30 Jan 2017 20:50:51 -0500 Subject: [PATCH] Update location of CI variables This commit sets the variables for network creation to the appropriate values. Since the network details are internal, this CI variables file is being moved to internal git. Change-Id: Ib55d2896991c74562f01e3cc56117af7110dc403 --- ansible/oooq/roles/bug-check/tasks/main.yml | 1 - ansible/oooq/roles/collectd-undercloud/tasks/main.yml | 1 - ansible/oooq/roles/collectd/tasks/main.yml | 1 - ansible/oooq/roles/gather-metadata/tasks/main.yml | 1 - ansible/oooq/roles/grafana-dashboard-setup/tasks/main.yml | 1 - ansible/oooq/roles/pre-install-setup/tasks/main.yml | 2 +- ci-scripts/README.rst | 4 +++- ci-scripts/config/tripleo/oooq/all.yml | 8 -------- 8 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 ci-scripts/config/tripleo/oooq/all.yml diff --git a/ansible/oooq/roles/bug-check/tasks/main.yml b/ansible/oooq/roles/bug-check/tasks/main.yml index ffd9b6509..0f451bf6b 100644 --- a/ansible/oooq/roles/bug-check/tasks/main.yml +++ b/ansible/oooq/roles/bug-check/tasks/main.yml @@ -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 diff --git a/ansible/oooq/roles/collectd-undercloud/tasks/main.yml b/ansible/oooq/roles/collectd-undercloud/tasks/main.yml index 74ccd7ed1..35f217ec9 100644 --- a/ansible/oooq/roles/collectd-undercloud/tasks/main.yml +++ b/ansible/oooq/roles/collectd-undercloud/tasks/main.yml @@ -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 diff --git a/ansible/oooq/roles/collectd/tasks/main.yml b/ansible/oooq/roles/collectd/tasks/main.yml index 49c93e1c8..d1a9ab49e 100644 --- a/ansible/oooq/roles/collectd/tasks/main.yml +++ b/ansible/oooq/roles/collectd/tasks/main.yml @@ -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 diff --git a/ansible/oooq/roles/gather-metadata/tasks/main.yml b/ansible/oooq/roles/gather-metadata/tasks/main.yml index 1d0dacaa3..c7d78c549 100644 --- a/ansible/oooq/roles/gather-metadata/tasks/main.yml +++ b/ansible/oooq/roles/gather-metadata/tasks/main.yml @@ -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 diff --git a/ansible/oooq/roles/grafana-dashboard-setup/tasks/main.yml b/ansible/oooq/roles/grafana-dashboard-setup/tasks/main.yml index 974398049..017d6c8ed 100644 --- a/ansible/oooq/roles/grafana-dashboard-setup/tasks/main.yml +++ b/ansible/oooq/roles/grafana-dashboard-setup/tasks/main.yml @@ -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" diff --git a/ansible/oooq/roles/pre-install-setup/tasks/main.yml b/ansible/oooq/roles/pre-install-setup/tasks/main.yml index 0e7cc0c88..3fef69e5d 100644 --- a/ansible/oooq/roles/pre-install-setup/tasks/main.yml +++ b/ansible/oooq/roles/pre-install-setup/tasks/main.yml @@ -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" diff --git a/ci-scripts/README.rst b/ci-scripts/README.rst index 3716ee350..7dcc0403e 100644 --- a/ci-scripts/README.rst +++ b/ci-scripts/README.rst @@ -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. :: diff --git a/ci-scripts/config/tripleo/oooq/all.yml b/ci-scripts/config/tripleo/oooq/all.yml deleted file mode 100644 index 2e85052c0..000000000 --- a/ci-scripts/config/tripleo/oooq/all.yml +++ /dev/null @@ -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