diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-10 15:31:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-10 15:31:49 +0000 |
| commit | ce4770e46df1792f80d27a279d7c6cef2d9af5e0 (patch) | |
| tree | 04cff6e5b81c3d728b6629cf7930e80a2ea71a1d /ci | |
| parent | d1043f15f044dc0ee0ab4c76038e74c5f3b7fe75 (diff) | |
| parent | ee3c2493f1c11c26737af8fa0cfa91722269817e (diff) | |
Merge changes from topics 'c_doc_update', 'detached_cleanup'
* changes:
Documentation updates
fixing detached state deployment
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | ci/dev_deploy_check.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index f9a5f0c7..da1d29e2 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1256,8 +1256,6 @@ parse_cmdline() { ##END FUNCTIONS main() { - # Make sure jinja2 is installed - easy_install-3.4 jinja2 > /dev/null parse_cmdline "$@" echo -e "${blue}INFO: Parsing network settings file...${reset}" parse_network_settings diff --git a/ci/dev_deploy_check.sh b/ci/dev_deploy_check.sh index e93e9f4f..8ba46ab0 100755 --- a/ci/dev_deploy_check.sh +++ b/ci/dev_deploy_check.sh @@ -35,3 +35,7 @@ for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs l fi fi done + + +# Make sure jinja2 is installed +easy_install-3.4 jinja2 |