update ansible roles directory for supporting commpass-core installing

BGS-80

Change-Id: I97a5d2a9b1f6c799c1976ec1cf6e687b108e0d0f
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

120 files changed, 13 insertions, 38 deletions

diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml b/compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml
deleted file mode 100644
index 9c0084e..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: restart keystone
-  service: name=keystone state=restarted enabled=yes
diff --git a/compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml b/compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml
deleted file mode 100644
index 21f4ef0..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: copy local sources.list
-  template: src=sources.list dest=/etc/apt/sources.list backup=yes
-  when: LOCAL_REPO is defined
-
-- name: copy deb packages
-  shell: cp -rf /opt/repo/pool/main/ /var/cache/apt/archive/
-  ignore_errors: True
-
-- name: add juno cloudarchive
-  apt_repository: repo="{{ juno_cloud_archive }}" state=present
-
-- name: first update pkgs
-  apt: update_cache=yes
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/handlers/main.yml b/compass/deploy/ansible/roles/cinder-controller/handlers/main.yml
index ef671dd..ef671dd 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/handlers/main.yml
+++ b/compass/deploy/ansible/roles/cinder-controller/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_config.yml b/compass/deploy/ansible/roles/cinder-controller/tasks/cinder_config.yml
index 7796cf7..7796cf7 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_config.yml
+++ b/compass/deploy/ansible/roles/cinder-controller/tasks/cinder_config.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_install.yml b/compass/deploy/ansible/roles/cinder-controller/tasks/cinder_install.yml
index 03ad432..03ad432 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_install.yml
+++ b/compass/deploy/ansible/roles/cinder-controller/tasks/cinder_install.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/main.yml b/compass/deploy/ansible/roles/cinder-controller/tasks/main.yml
index 1dbe91f..1dbe91f 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/main.yml
+++ b/compass/deploy/ansible/roles/cinder-controller/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/api-paste.ini b/compass/deploy/ansible/roles/cinder-controller/templates/api-paste.ini
index b568a17..b568a17 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/api-paste.ini
+++ b/compass/deploy/ansible/roles/cinder-controller/templates/api-paste.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder.conf b/compass/deploy/ansible/roles/cinder-controller/templates/cinder.conf
index e34fd2f..e34fd2f 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder.conf
+++ b/compass/deploy/ansible/roles/cinder-controller/templates/cinder.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder_init.sh b/compass/deploy/ansible/roles/cinder-controller/templates/cinder_init.sh
index 0ec61b6..0ec61b6 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder_init.sh
+++ b/compass/deploy/ansible/roles/cinder-controller/templates/cinder_init.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/files/loop.yml b/compass/deploy/ansible/roles/cinder-volume/files/loop.yml
index e872652..e872652 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/files/loop.yml
+++ b/compass/deploy/ansible/roles/cinder-volume/files/loop.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/handlers/main.yml b/compass/deploy/ansible/roles/cinder-volume/handlers/main.yml
index d8e8852..ad917ce 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/handlers/main.yml
+++ b/compass/deploy/ansible/roles/cinder-volume/handlers/main.yml
@@ -1,4 +1,3 @@
 ---
 - name: restart cinder-volume
   service: name=cinder-volume state=restarted enabled=yes
-
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/tasks/main.yml b/compass/deploy/ansible/roles/cinder-volume/tasks/main.yml
index 8c0e626..8c0e626 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/tasks/main.yml
+++ b/compass/deploy/ansible/roles/cinder-volume/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/templates/cinder.conf b/compass/deploy/ansible/roles/cinder-volume/templates/cinder.conf
index aa3b8cc..aa3b8cc 100644
--- a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/templates/cinder.conf
+++ b/compass/deploy/ansible/roles/cinder-volume/templates/cinder.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/common/files/sources.list.d/cloudarchive-juno.list b/compass/deploy/ansible/roles/common/files/sources.list.d/cloudarchive-juno.list
index 920f3d2..920f3d2 100644
--- a/compass/deploy/ansible/openstack_juno/roles/common/files/sources.list.d/cloudarchive-juno.list
+++ b/compass/deploy/ansible/roles/common/files/sources.list.d/cloudarchive-juno.list
diff --git a/compass/deploy/ansible/openstack_juno/roles/common/tasks/main.yml b/compass/deploy/ansible/roles/common/tasks/main.yml
index ce595f5..ce595f5 100644
--- a/compass/deploy/ansible/openstack_juno/roles/common/tasks/main.yml
+++ b/compass/deploy/ansible/roles/common/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/common/templates/hosts b/compass/deploy/ansible/roles/common/templates/hosts
index 9d27c0a..9d27c0a 100644
--- a/compass/deploy/ansible/openstack_juno/roles/common/templates/hosts
+++ b/compass/deploy/ansible/roles/common/templates/hosts
diff --git a/compass/deploy/ansible/openstack_juno/roles/common/templates/ntp.conf b/compass/deploy/ansible/roles/common/templates/ntp.conf
index c613809..c613809 100644
--- a/compass/deploy/ansible/openstack_juno/roles/common/templates/ntp.conf
+++ b/compass/deploy/ansible/roles/common/templates/ntp.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/dashboard/tasks/main.yml b/compass/deploy/ansible/roles/dashboard/tasks/main.yml
index 465b996..465b996 100644
--- a/compass/deploy/ansible/openstack_juno/roles/dashboard/tasks/main.yml
+++ b/compass/deploy/ansible/roles/dashboard/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/dashboard/templates/local_settings.py b/compass/deploy/ansible/roles/dashboard/templates/local_settings.py
index 87e06e3..87e06e3 100644
--- a/compass/deploy/ansible/openstack_juno/roles/dashboard/templates/local_settings.py
+++ b/compass/deploy/ansible/roles/dashboard/templates/local_settings.py
diff --git a/compass/deploy/ansible/openstack_juno/roles/dashboard/templates/openstack-dashboard.conf b/compass/deploy/ansible/roles/dashboard/templates/openstack-dashboard.conf
index a5a791a..a5a791a 100644
--- a/compass/deploy/ansible/openstack_juno/roles/dashboard/templates/openstack-dashboard.conf
+++ b/compass/deploy/ansible/roles/dashboard/templates/openstack-dashboard.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/files/my.cnf b/compass/deploy/ansible/roles/database/files/my.cnf
index d61f947..d61f947 100644
--- a/compass/deploy/ansible/openstack_juno/roles/database/files/my.cnf
+++ b/compass/deploy/ansible/roles/database/files/my.cnf
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml b/compass/deploy/ansible/roles/database/tasks/main.yml
index e66f0cd..e66f0cd 100644
--- a/compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml
+++ b/compass/deploy/ansible/roles/database/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml b/compass/deploy/ansible/roles/database/tasks/mariadb.yml
index f87ea2f..093dfd1 100644
--- a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml
+++ b/compass/deploy/ansible/roles/database/tasks/mariadb.yml
@@ -7,22 +7,8 @@
       #- mariadb-client-5.5
       - mysql-client-5.5
       - python-mysqldb
-
-- name: download mariadb and galera deb package
-  get_url: url={{ item.url }} dest=/opt/{{ item.filename }}
-  register: result
-  until: result|success
-  retries: 5
-  delay: 3
-  with_items:
-    - { url:  "{{ MARIADB_URL }}", filename: "{{ MARIADB }}" }
-    - { url:  "{{ GALERA_URL }}", filename: "{{ GALERA }}" }
-
-- name: install mariadb  and galera packages
-  command: dpkg -i /opt/{{ item }}
-  with_items:
-    - "{{ MARIADB }}"
-    - "{{ GALERA }}"
+      - mysql-server-wsrep
+      - galera
 
 - name: create mysql log directy
   file: path=/var/log/mysql state=directory owner=mysql group=mysql mode=0755
@@ -53,7 +39,6 @@
   with_items:
    - mysql
 
-
 - name: create database/user
   shell: /opt/data.sh
   when: HA_CLUSTER[inventory_hostname] == ''
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml b/compass/deploy/ansible/roles/database/tasks/mysql.yml
index 327b656..327b656 100644
--- a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml
+++ b/compass/deploy/ansible/roles/database/tasks/mysql.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/templates/data.j2 b/compass/deploy/ansible/roles/database/templates/data.j2
index c894b32..c894b32 100644
--- a/compass/deploy/ansible/openstack_juno/roles/database/templates/data.j2
+++ b/compass/deploy/ansible/roles/database/templates/data.j2
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/templates/my.cnf b/compass/deploy/ansible/roles/database/templates/my.cnf
index 165d619..165d619 100644
--- a/compass/deploy/ansible/openstack_juno/roles/database/templates/my.cnf
+++ b/compass/deploy/ansible/roles/database/templates/my.cnf
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/templates/wsrep.cnf b/compass/deploy/ansible/roles/database/templates/wsrep.cnf
index b9e9424..b9e9424 100644
--- a/compass/deploy/ansible/openstack_juno/roles/database/templates/wsrep.cnf
+++ b/compass/deploy/ansible/roles/database/templates/wsrep.cnf
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/handlers/main.yml b/compass/deploy/ansible/roles/glance/handlers/main.yml
index d8eaa44..d8eaa44 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/handlers/main.yml
+++ b/compass/deploy/ansible/roles/glance/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_config.yml b/compass/deploy/ansible/roles/glance/tasks/glance_config.yml
index 28392a3..28392a3 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_config.yml
+++ b/compass/deploy/ansible/roles/glance/tasks/glance_config.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_install.yml b/compass/deploy/ansible/roles/glance/tasks/glance_install.yml
index 505b3b0..505b3b0 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_install.yml
+++ b/compass/deploy/ansible/roles/glance/tasks/glance_install.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/main.yml b/compass/deploy/ansible/roles/glance/tasks/main.yml
index 296f0dc..296f0dc 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/main.yml
+++ b/compass/deploy/ansible/roles/glance/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/nfs.yml b/compass/deploy/ansible/roles/glance/tasks/nfs.yml
index c03ab4d..c03ab4d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/tasks/nfs.yml
+++ b/compass/deploy/ansible/roles/glance/tasks/nfs.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-api.conf b/compass/deploy/ansible/roles/glance/templates/glance-api.conf
index 763539e..763539e 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-api.conf
+++ b/compass/deploy/ansible/roles/glance/templates/glance-api.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-registry.conf b/compass/deploy/ansible/roles/glance/templates/glance-registry.conf
index 8d731a2..8d731a2 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-registry.conf
+++ b/compass/deploy/ansible/roles/glance/templates/glance-registry.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/glance/templates/image_upload.sh b/compass/deploy/ansible/roles/glance/templates/image_upload.sh
index 9dd1fa8..9dd1fa8 100644
--- a/compass/deploy/ansible/openstack_juno/roles/glance/templates/image_upload.sh
+++ b/compass/deploy/ansible/roles/glance/templates/image_upload.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/files/galera_chk b/compass/deploy/ansible/roles/ha/files/galera_chk
index 9fd165c..9fd165c 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/files/galera_chk
+++ b/compass/deploy/ansible/roles/ha/files/galera_chk
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/files/mysqlchk b/compass/deploy/ansible/roles/ha/files/mysqlchk
index 2c03f19..2c03f19 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/files/mysqlchk
+++ b/compass/deploy/ansible/roles/ha/files/mysqlchk
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/files/notify.sh b/compass/deploy/ansible/roles/ha/files/notify.sh
index 5edffe8..5edffe8 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/files/notify.sh
+++ b/compass/deploy/ansible/roles/ha/files/notify.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/handlers/main.yml b/compass/deploy/ansible/roles/ha/handlers/main.yml
index a02c686..a02c686 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/handlers/main.yml
+++ b/compass/deploy/ansible/roles/ha/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/tasks/main.yml b/compass/deploy/ansible/roles/ha/tasks/main.yml
index a00c21a..a00c21a 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/tasks/main.yml
+++ b/compass/deploy/ansible/roles/ha/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/templates/failover.j2 b/compass/deploy/ansible/roles/ha/templates/failover.j2
index b03c737..b03c737 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/templates/failover.j2
+++ b/compass/deploy/ansible/roles/ha/templates/failover.j2
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/templates/haproxy.cfg b/compass/deploy/ansible/roles/ha/templates/haproxy.cfg
index 4ed528a..4ed528a 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/templates/haproxy.cfg
+++ b/compass/deploy/ansible/roles/ha/templates/haproxy.cfg
diff --git a/compass/deploy/ansible/openstack_juno/roles/ha/templates/keepalived.conf b/compass/deploy/ansible/roles/ha/templates/keepalived.conf
index 0b49137..0b49137 100644
--- a/compass/deploy/ansible/openstack_juno/roles/ha/templates/keepalived.conf
+++ b/compass/deploy/ansible/roles/ha/templates/keepalived.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_config.yml b/compass/deploy/ansible/roles/keystone/tasks/keystone_config.yml
index 3203b26..3203b26 100644
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_config.yml
+++ b/compass/deploy/ansible/roles/keystone/tasks/keystone_config.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_install.yml b/compass/deploy/ansible/roles/keystone/tasks/keystone_install.yml
index 7d92395..e69c069 100644
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_install.yml
+++ b/compass/deploy/ansible/roles/keystone/tasks/keystone_install.yml
@@ -9,7 +9,6 @@
 
 - name: update keystone conf
   template: src=keystone.conf dest=/etc/keystone/keystone.conf backup=yes
-  notify: restart keystone
 
 - name: delete sqlite database
   shell: rm /var/lib/keystone/keystone.db || echo sqllite database already removed
@@ -25,3 +24,6 @@
   with_items:
     - admin-openrc.sh
     - demo-openrc.sh
+
+- name: manually start keystone
+  service: name=keystone state=restarted enabled=yes
diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/main.yml b/compass/deploy/ansible/roles/keystone/tasks/main.yml
index 2f36e91..2f36e91 100644
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/main.yml
+++ b/compass/deploy/ansible/roles/keystone/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/admin-openrc.sh b/compass/deploy/ansible/roles/keystone/templates/admin-openrc.sh
index f2e0d61..f2e0d61 100644
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/admin-openrc.sh
+++ b/compass/deploy/ansible/roles/keystone/templates/admin-openrc.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/demo-openrc.sh b/compass/deploy/ansible/roles/keystone/templates/demo-openrc.sh
index 8bdc51b..8bdc51b 100644
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/demo-openrc.sh
+++ b/compass/deploy/ansible/roles/keystone/templates/demo-openrc.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone.conf b/compass/deploy/ansible/roles/keystone/templates/keystone.conf
index c40f77f..fc8bf1f 100644
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone.conf
+++ b/compass/deploy/ansible/roles/keystone/templates/keystone.conf
@@ -355,11 +355,11 @@ rabbit_password={{ RABBIT_PASS }}
 
 # Print debugging output (set logging level to DEBUG instead
 # of default WARNING level). (boolean value)
-#debug=false
+debug={{ DEBUG }}
 
 # Print more verbose output (set logging level to INFO instead
 # of default WARNING level). (boolean value)
-#verbose=false
+verbose={{ VERBOSE }}
 
 # Log output to standard error (boolean value)
 #use_stderr=true
diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone_init b/compass/deploy/ansible/roles/keystone/templates/keystone_init
index 729669b..729669b 100644
--- a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone_init
+++ b/compass/deploy/ansible/roles/keystone/templates/keystone_init
diff --git a/compass/deploy/ansible/openstack_juno/roles/monitor/files/check_service.sh b/compass/deploy/ansible/roles/monitor/files/check_service.sh
index d309673..d309673 100644
--- a/compass/deploy/ansible/openstack_juno/roles/monitor/files/check_service.sh
+++ b/compass/deploy/ansible/roles/monitor/files/check_service.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/monitor/files/root b/compass/deploy/ansible/roles/monitor/files/root
index 9c55c4f..9c55c4f 100644
--- a/compass/deploy/ansible/openstack_juno/roles/monitor/files/root
+++ b/compass/deploy/ansible/roles/monitor/files/root
diff --git a/compass/deploy/ansible/openstack_juno/roles/monitor/tasks/main.yml b/compass/deploy/ansible/roles/monitor/tasks/main.yml
index e5b93f3..e5b93f3 100644
--- a/compass/deploy/ansible/openstack_juno/roles/monitor/tasks/main.yml
+++ b/compass/deploy/ansible/roles/monitor/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/mq/tasks/main.yml b/compass/deploy/ansible/roles/mq/tasks/main.yml
index 4ae4065..4ae4065 100644
--- a/compass/deploy/ansible/openstack_juno/roles/mq/tasks/main.yml
+++ b/compass/deploy/ansible/roles/mq/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq.yml b/compass/deploy/ansible/roles/mq/tasks/rabbitmq.yml
index 5714406..5714406 100644
--- a/compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq.yml
+++ b/compass/deploy/ansible/roles/mq/tasks/rabbitmq.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq_cluster.yml b/compass/deploy/ansible/roles/mq/tasks/rabbitmq_cluster.yml
index afd4c77..afd4c77 100644
--- a/compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq_cluster.yml
+++ b/compass/deploy/ansible/roles/mq/tasks/rabbitmq_cluster.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/mq/templates/.erlang.cookie b/compass/deploy/ansible/roles/mq/templates/.erlang.cookie
index cadcfaf..cadcfaf 100644
--- a/compass/deploy/ansible/openstack_juno/roles/mq/templates/.erlang.cookie
+++ b/compass/deploy/ansible/roles/mq/templates/.erlang.cookie
diff --git a/compass/deploy/ansible/openstack_juno/roles/mq/templates/rabbitmq-env.conf b/compass/deploy/ansible/roles/mq/templates/rabbitmq-env.conf
index 6dd7349..6dd7349 100644
--- a/compass/deploy/ansible/openstack_juno/roles/mq/templates/rabbitmq-env.conf
+++ b/compass/deploy/ansible/roles/mq/templates/rabbitmq-env.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-common/handlers/main.yml b/compass/deploy/ansible/roles/neutron-common/handlers/main.yml
index 36d779d..36d779d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-common/handlers/main.yml
+++ b/compass/deploy/ansible/roles/neutron-common/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/defaults/main.yml b/compass/deploy/ansible/roles/neutron-compute/defaults/main.yml
index 825178b..825178b 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/defaults/main.yml
+++ b/compass/deploy/ansible/roles/neutron-compute/defaults/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/handlers/main.yml b/compass/deploy/ansible/roles/neutron-compute/handlers/main.yml
index 36d779d..36d779d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/handlers/main.yml
+++ b/compass/deploy/ansible/roles/neutron-compute/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/tasks/main.yml b/compass/deploy/ansible/roles/neutron-compute/tasks/main.yml
index 93ee46f..93ee46f 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/tasks/main.yml
+++ b/compass/deploy/ansible/roles/neutron-compute/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dhcp_agent.ini b/compass/deploy/ansible/roles/neutron-compute/templates/dhcp_agent.ini
index 19eb62e..19eb62e 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dhcp_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/dhcp_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dnsmasq-neutron.conf b/compass/deploy/ansible/roles/neutron-compute/templates/dnsmasq-neutron.conf
index 7bcbd9d..7bcbd9d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dnsmasq-neutron.conf
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/dnsmasq-neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/etc/xorp/config.boot b/compass/deploy/ansible/roles/neutron-compute/templates/etc/xorp/config.boot
index 32caf96..32caf96 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/etc/xorp/config.boot
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/etc/xorp/config.boot
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/l3_agent.ini b/compass/deploy/ansible/roles/neutron-compute/templates/l3_agent.ini
index b394c00..b394c00 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/l3_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/l3_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/metadata_agent.ini b/compass/deploy/ansible/roles/neutron-compute/templates/metadata_agent.ini
index 6badf28..6badf28 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/metadata_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/metadata_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/ml2_conf.ini b/compass/deploy/ansible/roles/neutron-compute/templates/ml2_conf.ini
index a790069..a790069 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/ml2_conf.ini
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/ml2_conf.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron-network.conf b/compass/deploy/ansible/roles/neutron-compute/templates/neutron-network.conf
index 93be9cb..93be9cb 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron-network.conf
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/neutron-network.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron.conf b/compass/deploy/ansible/roles/neutron-compute/templates/neutron.conf
index 1575367..1575367 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron.conf
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron_init.sh b/compass/deploy/ansible/roles/neutron-compute/templates/neutron_init.sh
index b92e202..b92e202 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron_init.sh
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/neutron_init.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/nova.conf b/compass/deploy/ansible/roles/neutron-compute/templates/nova.conf
index 4988cb0..4988cb0 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/nova.conf
+++ b/compass/deploy/ansible/roles/neutron-compute/templates/nova.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/handlers/main.yml b/compass/deploy/ansible/roles/neutron-controller/handlers/main.yml
index b4c1585..b4c1585 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/handlers/main.yml
+++ b/compass/deploy/ansible/roles/neutron-controller/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml b/compass/deploy/ansible/roles/neutron-controller/tasks/main.yml
index 9c04d74..9c04d74 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml
+++ b/compass/deploy/ansible/roles/neutron-controller/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_config.yml
index 77cc29a..77cc29a 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml
+++ b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_config.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_install.yml
index 6165299..6165299 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml
+++ b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_install.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dhcp_agent.ini b/compass/deploy/ansible/roles/neutron-controller/templates/dhcp_agent.ini
index 19eb62e..19eb62e 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dhcp_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/dhcp_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dnsmasq-neutron.conf b/compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf
index 7bcbd9d..7bcbd9d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dnsmasq-neutron.conf
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/etc/xorp/config.boot b/compass/deploy/ansible/roles/neutron-controller/templates/etc/xorp/config.boot
index 32caf96..32caf96 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/etc/xorp/config.boot
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/etc/xorp/config.boot
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/l3_agent.ini b/compass/deploy/ansible/roles/neutron-controller/templates/l3_agent.ini
index b394c00..b394c00 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/l3_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/l3_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/metadata_agent.ini b/compass/deploy/ansible/roles/neutron-controller/templates/metadata_agent.ini
index 6badf28..6badf28 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/metadata_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/metadata_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/ml2_conf.ini b/compass/deploy/ansible/roles/neutron-controller/templates/ml2_conf.ini
index a790069..a790069 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/ml2_conf.ini
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/ml2_conf.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron-network.conf b/compass/deploy/ansible/roles/neutron-controller/templates/neutron-network.conf
index 93be9cb..93be9cb 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron-network.conf
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/neutron-network.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron.conf b/compass/deploy/ansible/roles/neutron-controller/templates/neutron.conf
index 2a66e94..2a66e94 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron.conf
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron_init.sh b/compass/deploy/ansible/roles/neutron-controller/templates/neutron_init.sh
index b92e202..b92e202 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron_init.sh
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/neutron_init.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/nova.conf b/compass/deploy/ansible/roles/neutron-controller/templates/nova.conf
index 9587073..9587073 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/nova.conf
+++ b/compass/deploy/ansible/roles/neutron-controller/templates/nova.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/handlers/main.yml b/compass/deploy/ansible/roles/neutron-network/handlers/main.yml
index d6c5cc8..d6c5cc8 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/handlers/main.yml
+++ b/compass/deploy/ansible/roles/neutron-network/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/igmp-router.yml b/compass/deploy/ansible/roles/neutron-network/tasks/igmp-router.yml
index d6f38a0..d6f38a0 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/igmp-router.yml
+++ b/compass/deploy/ansible/roles/neutron-network/tasks/igmp-router.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/main.yml b/compass/deploy/ansible/roles/neutron-network/tasks/main.yml
index 1d4b591..1d4b591 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/main.yml
+++ b/compass/deploy/ansible/roles/neutron-network/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/odl.yml b/compass/deploy/ansible/roles/neutron-network/tasks/odl.yml
index a2b449c..a2b449c 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/odl.yml
+++ b/compass/deploy/ansible/roles/neutron-network/tasks/odl.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dhcp_agent.ini b/compass/deploy/ansible/roles/neutron-network/templates/dhcp_agent.ini
index 19eb62e..19eb62e 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dhcp_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-network/templates/dhcp_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dnsmasq-neutron.conf b/compass/deploy/ansible/roles/neutron-network/templates/dnsmasq-neutron.conf
index 7bcbd9d..7bcbd9d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dnsmasq-neutron.conf
+++ b/compass/deploy/ansible/roles/neutron-network/templates/dnsmasq-neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/etc/xorp/config.boot b/compass/deploy/ansible/roles/neutron-network/templates/etc/xorp/config.boot
index 32caf96..32caf96 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/etc/xorp/config.boot
+++ b/compass/deploy/ansible/roles/neutron-network/templates/etc/xorp/config.boot
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/l3_agent.ini b/compass/deploy/ansible/roles/neutron-network/templates/l3_agent.ini
index b394c00..b394c00 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/l3_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-network/templates/l3_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/metadata_agent.ini b/compass/deploy/ansible/roles/neutron-network/templates/metadata_agent.ini
index 6badf28..6badf28 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/metadata_agent.ini
+++ b/compass/deploy/ansible/roles/neutron-network/templates/metadata_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/ml2_conf.ini b/compass/deploy/ansible/roles/neutron-network/templates/ml2_conf.ini
index a790069..a790069 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/ml2_conf.ini
+++ b/compass/deploy/ansible/roles/neutron-network/templates/ml2_conf.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron-network.conf b/compass/deploy/ansible/roles/neutron-network/templates/neutron-network.conf
index 93be9cb..93be9cb 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron-network.conf
+++ b/compass/deploy/ansible/roles/neutron-network/templates/neutron-network.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron.conf b/compass/deploy/ansible/roles/neutron-network/templates/neutron.conf
index 1575367..1575367 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron.conf
+++ b/compass/deploy/ansible/roles/neutron-network/templates/neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron_init.sh b/compass/deploy/ansible/roles/neutron-network/templates/neutron_init.sh
index b92e202..b92e202 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron_init.sh
+++ b/compass/deploy/ansible/roles/neutron-network/templates/neutron_init.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/nova.conf b/compass/deploy/ansible/roles/neutron-network/templates/nova.conf
index 9587073..9587073 100644
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/nova.conf
+++ b/compass/deploy/ansible/roles/neutron-network/templates/nova.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-compute/handlers/main.yml b/compass/deploy/ansible/roles/nova-compute/handlers/main.yml
index c135003..c135003 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-compute/handlers/main.yml
+++ b/compass/deploy/ansible/roles/nova-compute/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-compute/tasks/main.yml b/compass/deploy/ansible/roles/nova-compute/tasks/main.yml
index 51c8dfa..51c8dfa 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-compute/tasks/main.yml
+++ b/compass/deploy/ansible/roles/nova-compute/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova-compute.conf b/compass/deploy/ansible/roles/nova-compute/templates/nova-compute.conf
index 401dee7..401dee7 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova-compute.conf
+++ b/compass/deploy/ansible/roles/nova-compute/templates/nova-compute.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova.conf b/compass/deploy/ansible/roles/nova-compute/templates/nova.conf
index 4988cb0..4988cb0 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova.conf
+++ b/compass/deploy/ansible/roles/nova-compute/templates/nova.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/handlers/main.yml b/compass/deploy/ansible/roles/nova-controller/handlers/main.yml
index b4c1585..b4c1585 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/handlers/main.yml
+++ b/compass/deploy/ansible/roles/nova-controller/handlers/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/main.yml b/compass/deploy/ansible/roles/nova-controller/tasks/main.yml
index 72a9f4d..72a9f4d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/main.yml
+++ b/compass/deploy/ansible/roles/nova-controller/tasks/main.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_config.yml b/compass/deploy/ansible/roles/nova-controller/tasks/nova_config.yml
index 62351fa..62351fa 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_config.yml
+++ b/compass/deploy/ansible/roles/nova-controller/tasks/nova_config.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_install.yml b/compass/deploy/ansible/roles/nova-controller/tasks/nova_install.yml
index a1cded5..a1cded5 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_install.yml
+++ b/compass/deploy/ansible/roles/nova-controller/tasks/nova_install.yml
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dhcp_agent.ini b/compass/deploy/ansible/roles/nova-controller/templates/dhcp_agent.ini
index 19eb62e..19eb62e 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dhcp_agent.ini
+++ b/compass/deploy/ansible/roles/nova-controller/templates/dhcp_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dnsmasq-neutron.conf b/compass/deploy/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf
index 7bcbd9d..7bcbd9d 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dnsmasq-neutron.conf
+++ b/compass/deploy/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/etc/xorp/config.boot b/compass/deploy/ansible/roles/nova-controller/templates/etc/xorp/config.boot
index 32caf96..32caf96 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/etc/xorp/config.boot
+++ b/compass/deploy/ansible/roles/nova-controller/templates/etc/xorp/config.boot
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/l3_agent.ini b/compass/deploy/ansible/roles/nova-controller/templates/l3_agent.ini
index b394c00..b394c00 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/l3_agent.ini
+++ b/compass/deploy/ansible/roles/nova-controller/templates/l3_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/metadata_agent.ini b/compass/deploy/ansible/roles/nova-controller/templates/metadata_agent.ini
index 6badf28..6badf28 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/metadata_agent.ini
+++ b/compass/deploy/ansible/roles/nova-controller/templates/metadata_agent.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/ml2_conf.ini b/compass/deploy/ansible/roles/nova-controller/templates/ml2_conf.ini
index a790069..a790069 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/ml2_conf.ini
+++ b/compass/deploy/ansible/roles/nova-controller/templates/ml2_conf.ini
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron-network.conf b/compass/deploy/ansible/roles/nova-controller/templates/neutron-network.conf
index 93be9cb..93be9cb 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron-network.conf
+++ b/compass/deploy/ansible/roles/nova-controller/templates/neutron-network.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron.conf b/compass/deploy/ansible/roles/nova-controller/templates/neutron.conf
index 1575367..1575367 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron.conf
+++ b/compass/deploy/ansible/roles/nova-controller/templates/neutron.conf
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron_init.sh b/compass/deploy/ansible/roles/nova-controller/templates/neutron_init.sh
index b92e202..b92e202 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron_init.sh
+++ b/compass/deploy/ansible/roles/nova-controller/templates/neutron_init.sh
diff --git a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/nova.conf b/compass/deploy/ansible/roles/nova-controller/templates/nova.conf
index c8991a3..c8991a3 100644
--- a/compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/nova.conf
+++ b/compass/deploy/ansible/roles/nova-controller/templates/nova.conf
diff --git a/compass/deploy/ansible/roles/repo/tasks/main.yml b/compass/deploy/ansible/roles/repo/tasks/main.yml
new file mode 100644
index 0000000..9476f80
--- /dev/null
+++ b/compass/deploy/ansible/roles/repo/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+- name: add juno cloudarchive
+  apt_repository: repo="{{ juno_cloud_archive }}" state=present
+
+- name: first update pkgs
+  apt: update_cache=yes
diff --git a/compass/deploy/ansible/openstack_juno/roles/repo/templates/sources.list b/compass/deploy/ansible/roles/repo/templates/sources.list
index 8b062e7..8b062e7 100644
--- a/compass/deploy/ansible/openstack_juno/roles/repo/templates/sources.list
+++ b/compass/deploy/ansible/roles/repo/templates/sources.list