Merge branch 'master' of github.com:open-cloud/xos
diff --git a/containers/synchronizer/Dockerfile b/containers/synchronizer/Dockerfile
index 7170e1c..8557a4d 100644
--- a/containers/synchronizer/Dockerfile
+++ b/containers/synchronizer/Dockerfile
@@ -1,6 +1,5 @@
FROM xosproject/xos
-# Install custom Ansible
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
openssh-client \
python-crypto \
@@ -8,11 +7,13 @@
python-paramiko \
python-yaml \
python-httplib2 \
+ rsync \
supervisor
RUN pip install -U \
jinja2
+# Install custom Ansible
RUN \
git clone -b release1.8.2 git://github.com/ansible/ansible.git /opt/ansible && \
git clone -b release1.8.2 git://github.com/ansible/ansible-modules-extras.git /opt/ansible/lib/ansible/modules/extras && \
diff --git a/xos/observers/base/SyncInstanceUsingAnsible.py b/xos/observers/base/SyncInstanceUsingAnsible.py
index 373178c..81f6632 100644
--- a/xos/observers/base/SyncInstanceUsingAnsible.py
+++ b/xos/observers/base/SyncInstanceUsingAnsible.py
@@ -113,7 +113,7 @@
key_name = instance.parent.slice.service.private_key_fn
if not os.path.exists(key_name):
- raise Exception("Node key %s does not exist" % node_key_name)
+ raise Exception("Node key %s does not exist" % key_name)
key = file(key_name).read()
@@ -219,4 +219,3 @@
self.map_delete_outputs(o,res)
except AttributeError:
pass
-