Code Review
/
genesis.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
5847a0f
)
update ansible roles directory for supporting commpass-core installing
56/956/1
author
carey.xu
<carey.xuhan@huawei.com>
Tue, 30 Jun 2015 06:53:17 +0000
(14:53 +0800)
committer
carey.xu
<carey.xuhan@huawei.com>
Tue, 30 Jun 2015 06:53:17 +0000
(14:53 +0800)
BGS-80
Change-Id: I97a5d2a9b1f6c799c1976ec1cf6e687b108e0d0f
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
120 files changed:
compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml
[deleted file]
patch
|
blob
|
history
compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml
[deleted file]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-controller/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-controller/tasks/cinder_config.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_config.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-controller/tasks/cinder_install.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_install.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-controller/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-controller/templates/api-paste.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/api-paste.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-controller/templates/cinder.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-controller/templates/cinder_init.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder_init.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-volume/files/loop.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/files/loop.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-volume/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/handlers/main.yml
with 98% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-volume/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/cinder-volume/templates/cinder.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/templates/cinder.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/common/files/sources.list.d/cloudarchive-juno.list
[moved from
compass/deploy/ansible/openstack_juno/roles/common/files/sources.list.d/cloudarchive-juno.list
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/common/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/common/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/common/templates/hosts
[moved from
compass/deploy/ansible/openstack_juno/roles/common/templates/hosts
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/common/templates/ntp.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/common/templates/ntp.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/dashboard/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/dashboard/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/dashboard/templates/local_settings.py
[moved from
compass/deploy/ansible/openstack_juno/roles/dashboard/templates/local_settings.py
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/dashboard/templates/openstack-dashboard.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/dashboard/templates/openstack-dashboard.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/database/files/my.cnf
[moved from
compass/deploy/ansible/openstack_juno/roles/database/files/my.cnf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/database/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/database/tasks/mariadb.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml
with 72% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/database/tasks/mysql.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/database/templates/data.j2
[moved from
compass/deploy/ansible/openstack_juno/roles/database/templates/data.j2
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/database/templates/my.cnf
[moved from
compass/deploy/ansible/openstack_juno/roles/database/templates/my.cnf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/database/templates/wsrep.cnf
[moved from
compass/deploy/ansible/openstack_juno/roles/database/templates/wsrep.cnf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/tasks/glance_config.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_config.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/tasks/glance_install.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_install.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/tasks/nfs.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/nfs.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/templates/glance-api.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-api.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/templates/glance-registry.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-registry.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/glance/templates/image_upload.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/glance/templates/image_upload.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/files/galera_chk
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/files/galera_chk
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/files/mysqlchk
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/files/mysqlchk
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/files/notify.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/files/notify.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/templates/failover.j2
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/templates/failover.j2
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/templates/haproxy.cfg
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/templates/haproxy.cfg
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/ha/templates/keepalived.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/ha/templates/keepalived.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/keystone/tasks/keystone_config.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_config.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/keystone/tasks/keystone_install.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_install.yml
with 91% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/keystone/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/keystone/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/keystone/templates/admin-openrc.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/admin-openrc.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/keystone/templates/demo-openrc.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/demo-openrc.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/keystone/templates/keystone.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone.conf
with 99% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/keystone/templates/keystone_init
[moved from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone_init
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/monitor/files/check_service.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/monitor/files/check_service.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/monitor/files/root
[moved from
compass/deploy/ansible/openstack_juno/roles/monitor/files/root
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/monitor/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/monitor/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/mq/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/mq/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/mq/tasks/rabbitmq.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/mq/tasks/rabbitmq_cluster.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq_cluster.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/mq/templates/.erlang.cookie
[moved from
compass/deploy/ansible/openstack_juno/roles/mq/templates/.erlang.cookie
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/mq/templates/rabbitmq-env.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/mq/templates/rabbitmq-env.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-common/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-common/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/defaults/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/defaults/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/dhcp_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dhcp_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/dnsmasq-neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dnsmasq-neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/etc/xorp/config.boot
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/etc/xorp/config.boot
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/l3_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/l3_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/metadata_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/metadata_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/ml2_conf.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/ml2_conf.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/neutron-network.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron-network.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/neutron_init.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron_init.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-compute/templates/nova.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/nova.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/tasks/neutron_config.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/tasks/neutron_install.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/dhcp_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dhcp_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dnsmasq-neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/etc/xorp/config.boot
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/etc/xorp/config.boot
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/l3_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/l3_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/metadata_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/metadata_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/ml2_conf.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/ml2_conf.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/neutron-network.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron-network.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/neutron_init.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron_init.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-controller/templates/nova.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/nova.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/tasks/igmp-router.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/igmp-router.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/tasks/odl.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/odl.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/dhcp_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dhcp_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/dnsmasq-neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dnsmasq-neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/etc/xorp/config.boot
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/etc/xorp/config.boot
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/l3_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/l3_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/metadata_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/metadata_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/ml2_conf.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/ml2_conf.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/neutron-network.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron-network.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/neutron_init.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron_init.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/neutron-network/templates/nova.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/nova.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-compute/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-compute/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-compute/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-compute/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-compute/templates/nova-compute.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova-compute.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-compute/templates/nova.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/handlers/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/handlers/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/tasks/main.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/main.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/tasks/nova_config.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_config.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/tasks/nova_install.yml
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_install.yml
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/dhcp_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dhcp_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dnsmasq-neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/etc/xorp/config.boot
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/etc/xorp/config.boot
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/l3_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/l3_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/metadata_agent.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/metadata_agent.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/ml2_conf.ini
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/ml2_conf.ini
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/neutron-network.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron-network.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/neutron.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/neutron_init.sh
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron_init.sh
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/nova-controller/templates/nova.conf
[moved from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/nova.conf
with 100% similarity]
patch
|
blob
|
history
compass/deploy/ansible/roles/repo/tasks/main.yml
[new file with mode: 0644]
patch
|
blob
compass/deploy/ansible/roles/repo/templates/sources.list
[moved from
compass/deploy/ansible/openstack_juno/roles/repo/templates/sources.list
with 100% similarity]
patch
|
blob
|
history
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
(file)
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
(file)
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_config.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/cinder_install.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/api-paste.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-controller/templates/cinder_init.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/files/loop.yml
rename to
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
similarity index 98%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/handlers/main.yml
rename to
compass/deploy/ansible/roles/cinder-volume/handlers/main.yml
index
d8e8852
..
ad917ce
100644
(file)
--- 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
---
- 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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/cinder-volume/templates/cinder.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/common/files/sources.list.d/cloudarchive-juno.list
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/common/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/common/templates/hosts
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/common/templates/ntp.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/dashboard/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/dashboard/templates/local_settings.py
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/dashboard/templates/openstack-dashboard.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/database/files/my.cnf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml
rename to
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
similarity index 72%
rename from
compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml
rename to
compass/deploy/ansible/roles/database/tasks/mariadb.yml
index
f87ea2f
..
093dfd1
100644
(file)
--- 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
#- 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
- 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
with_items:
- mysql
-
- name: create database/user
shell: /opt/data.sh
when: HA_CLUSTER[inventory_hostname] == ''
- 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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/database/templates/data.j2
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/database/templates/my.cnf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/database/templates/wsrep.cnf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_config.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/glance_install.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/tasks/nfs.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-api.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/templates/glance-registry.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/glance/templates/image_upload.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/files/galera_chk
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/files/mysqlchk
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/files/notify.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/templates/failover.j2
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/templates/haproxy.cfg
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/ha/templates/keepalived.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_config.yml
rename to
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
similarity index 91%
rename from
compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_install.yml
rename to
compass/deploy/ansible/roles/keystone/tasks/keystone_install.yml
index
7d92395
..
e69c069
100644
(file)
--- 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
- 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
- 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
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/keystone/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/admin-openrc.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/demo-openrc.sh
rename to
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
similarity index 99%
rename from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone.conf
rename to
compass/deploy/ansible/roles/keystone/templates/keystone.conf
index
c40f77f
..
fc8bf1f
100644
(file)
--- 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)
# 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)
# 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
# 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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone_init
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/monitor/files/check_service.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/monitor/files/root
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/monitor/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/mq/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/mq/tasks/rabbitmq_cluster.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/mq/templates/.erlang.cookie
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/mq/templates/rabbitmq-env.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-common/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/defaults/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dhcp_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/dnsmasq-neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/etc/xorp/config.boot
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/l3_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/metadata_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/ml2_conf.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron-network.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/neutron_init.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-compute/templates/nova.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dhcp_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/dnsmasq-neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/etc/xorp/config.boot
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/l3_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/metadata_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/ml2_conf.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron-network.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/neutron_init.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-controller/templates/nova.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/igmp-router.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/tasks/odl.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dhcp_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/dnsmasq-neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/etc/xorp/config.boot
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/l3_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/metadata_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/ml2_conf.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron-network.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/neutron_init.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/neutron-network/templates/nova.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-compute/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-compute/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova-compute.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-compute/templates/nova.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/handlers/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/main.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_config.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/tasks/nova_install.yml
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dhcp_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/dnsmasq-neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/etc/xorp/config.boot
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/l3_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/metadata_agent.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/ml2_conf.ini
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron-network.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron.conf
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/neutron_init.sh
rename to
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/nova-controller/templates/nova.conf
rename to
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
(file)
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
similarity index 100%
rename from
compass/deploy/ansible/openstack_juno/roles/repo/templates/sources.list
rename to
compass/deploy/ansible/roles/repo/templates/sources.list