From e1c3aa1b0c8230a50a8d751ee3c7ba4f0d8831e2 Mon Sep 17 00:00:00 2001 From: Tong Li Date: Sat, 2 Apr 2016 00:15:13 -0400 Subject: [PATCH] move up one more dependencies move up all the dependencies so that there won't be any dependency conflict. Kiloeyes and Monasca agent can co-exist now. Change-Id: I4fe39b1f79ff12fbee03ea4327fe32f3eece5997 --- requirements.txt | 2 +- vagrant/README.md | 16 ++++++++-------- vagrant/onvm/conf/nodes.conf.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index efd0a27..1bc5e2b 100755 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ pastedeploy>=1.3.3 pbr>=1.6 python-dateutil>=1.5 six>=1.9.0 -stevedore>=0.14 +stevedore>=1.5.0 ujson>=1.33 eventlet!=0.18.3,>=0.18.2 pyparsing==2.0.1 diff --git a/vagrant/README.md b/vagrant/README.md index 333d81d..e466aac 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -25,14 +25,14 @@ required software to run kiloeyes. Usage: ====== You can install everything onto one machine or you can choose install different -components onto different servers. Currently python-keystonemiddleware which -is used by kiloeyes for security, but its dependencies conflict with agent -dependcies, so kiloeyes currently can not co-exist with agent on a signle -machine. It is best to have kiloeyes and agent installed onto the separate -machines to avoid the installation headaches. This vagrant project uses -configuration files in directory vagrant/onvm/conf. File nodes.conf.yml is -used to configure how many nodes to install various components, ids.conf.yml -file is used to save credentials. +components onto different servers. It is best to have kiloeyes and agent +installed onto the separate machines. In a typical production environment, you +would most likely install agents onto systems that you want Kiloeyes to monitor. +For a development environment, you can simply install everything onto one +machine. This vagrant project uses configuration files in directory +vagrant/onvm/conf to install various components. File nodes.conf.yml is +used to configure how many nodes to install and what to be installed on which +nodes. ids.conf.yml file is used to save credentials. Here is an example:: diff --git a/vagrant/onvm/conf/nodes.conf.yml b/vagrant/onvm/conf/nodes.conf.yml index 46ffe7f..34ccc15 100644 --- a/vagrant/onvm/conf/nodes.conf.yml +++ b/vagrant/onvm/conf/nodes.conf.yml @@ -5,7 +5,7 @@ controller: agent01: host_name: agent01.leap.dev - eth0: 192.168.1.88 + eth0: 192.168.1.90 logical2physical: kiloeyes: controller