From 70360bca6a156accb125fa1d307f33737f58a827 Mon Sep 17 00:00:00 2001 From: Xicheng Chang Date: Thu, 21 May 2015 20:28:18 -0700 Subject: [PATCH] Changed ansible code structure. Moved roles to the parent directory so that different adapters don't have duplicated roles in their respective paths. Change-Id: Ia71c473b33fed94276d4d0b4764b2f4ab2e988e0 --- .../roles/cinder-controller/handlers/main.yml | 0 .../{openstack_juno => }/roles/cinder-controller/tasks/main.yml | 0 .../roles/cinder-controller/templates/api-paste.ini | 0 .../roles/cinder-controller/templates/cinder.conf | 0 .../roles/cinder-controller/templates/cinder_init.sh | 0 ansible/{openstack_juno => }/roles/cinder-volume/files/loop.yml | 0 .../{openstack_juno => }/roles/cinder-volume/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/cinder-volume/tasks/main.yml | 0 .../roles/cinder-volume/templates/cinder.conf | 0 .../roles/common/files/sources.list.d/cloudarchive-juno.list | 0 ansible/{openstack_juno => }/roles/common/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/common/tasks/main.yml | 0 ansible/{openstack_juno => }/roles/common/templates/hosts | 0 ansible/{openstack_juno => }/roles/common/templates/ntp.conf | 0 ansible/{openstack_juno => }/roles/dashboard/tasks/main.yml | 0 .../roles/dashboard/templates/local_settings.py | 0 .../roles/dashboard/templates/openstack-dashboard.conf | 0 ansible/{openstack_juno => }/roles/database/files/my.cnf | 0 ansible/{openstack_juno => }/roles/database/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/database/tasks/main.yml | 0 ansible/{openstack_juno => }/roles/glance/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/glance/tasks/main.yml | 0 .../{openstack_juno => }/roles/glance/templates/glance-api.conf | 0 .../roles/glance/templates/glance-registry.conf | 0 .../{openstack_juno => }/roles/glance/templates/image_upload.sh | 0 ansible/{openstack_juno => }/roles/keystone/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/keystone/tasks/main.yml | 0 .../{openstack_juno => }/roles/keystone/templates/admin-openrc.sh | 0 .../{openstack_juno => }/roles/keystone/templates/demo-openrc.sh | 0 .../{openstack_juno => }/roles/keystone/templates/keystone.conf | 0 .../{openstack_juno => }/roles/keystone/templates/keystone_init | 0 ansible/{openstack_juno => }/roles/mq/tasks/main.yml | 0 ansible/{openstack_juno => }/roles/mq/tasks/rabbitmq.yml | 0 .../{openstack_juno => }/roles/neutron-common/handlers/main.yml | 0 .../{openstack_juno => }/roles/neutron-compute/defaults/main.yml | 0 .../{openstack_juno => }/roles/neutron-compute/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/neutron-compute/tasks/main.yml | 0 .../roles/neutron-compute/templates/dhcp_agent.ini | 0 .../roles/neutron-compute/templates/dnsmasq-neutron.conf | 0 .../roles/neutron-compute/templates/etc/xorp/config.boot | 0 .../roles/neutron-compute/templates/l3_agent.ini | 0 .../roles/neutron-compute/templates/metadata_agent.ini | 0 .../roles/neutron-compute/templates/ml2_conf.ini | 0 .../roles/neutron-compute/templates/neutron-network.conf | 0 .../roles/neutron-compute/templates/neutron.conf | 0 .../roles/neutron-compute/templates/neutron_init.sh | 0 .../roles/neutron-compute/templates/nova.conf | 0 .../roles/neutron-controller/handlers/main.yml | 0 .../{openstack_juno => }/roles/neutron-controller/tasks/main.yml | 0 .../roles/neutron-controller/templates/dhcp_agent.ini | 0 .../roles/neutron-controller/templates/dnsmasq-neutron.conf | 0 .../roles/neutron-controller/templates/etc/xorp/config.boot | 0 .../roles/neutron-controller/templates/l3_agent.ini | 0 .../roles/neutron-controller/templates/metadata_agent.ini | 0 .../roles/neutron-controller/templates/ml2_conf.ini | 0 .../roles/neutron-controller/templates/neutron-network.conf | 0 .../roles/neutron-controller/templates/neutron.conf | 0 .../roles/neutron-controller/templates/neutron_init.sh | 0 .../roles/neutron-controller/templates/nova.conf | 0 .../{openstack_juno => }/roles/neutron-network/handlers/main.yml | 0 .../roles/neutron-network/tasks/igmp-router.yml | 0 ansible/{openstack_juno => }/roles/neutron-network/tasks/main.yml | 0 ansible/{openstack_juno => }/roles/neutron-network/tasks/odl.yml | 0 .../roles/neutron-network/templates/dhcp_agent.ini | 0 .../roles/neutron-network/templates/dnsmasq-neutron.conf | 0 .../roles/neutron-network/templates/etc/xorp/config.boot | 0 .../roles/neutron-network/templates/l3_agent.ini | 0 .../roles/neutron-network/templates/metadata_agent.ini | 0 .../roles/neutron-network/templates/ml2_conf.ini | 0 .../roles/neutron-network/templates/neutron-network.conf | 0 .../roles/neutron-network/templates/neutron.conf | 0 .../roles/neutron-network/templates/neutron_init.sh | 0 .../roles/neutron-network/templates/nova.conf | 0 ansible/{openstack_juno => }/roles/nova-compute/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/nova-compute/tasks/main.yml | 0 .../roles/nova-compute/templates/nova-compute.conf | 0 .../{openstack_juno => }/roles/nova-compute/templates/nova.conf | 0 .../{openstack_juno => }/roles/nova-controller/handlers/main.yml | 0 ansible/{openstack_juno => }/roles/nova-controller/tasks/main.yml | 0 .../roles/nova-controller/templates/dhcp_agent.ini | 0 .../roles/nova-controller/templates/dnsmasq-neutron.conf | 0 .../roles/nova-controller/templates/etc/xorp/config.boot | 0 .../roles/nova-controller/templates/l3_agent.ini | 0 .../roles/nova-controller/templates/metadata_agent.ini | 0 .../roles/nova-controller/templates/ml2_conf.ini | 0 .../roles/nova-controller/templates/neutron-network.conf | 0 .../roles/nova-controller/templates/neutron.conf | 0 .../roles/nova-controller/templates/neutron_init.sh | 0 .../roles/nova-controller/templates/nova.conf | 0 89 files changed, 0 insertions(+), 0 deletions(-) rename ansible/{openstack_juno => }/roles/cinder-controller/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/cinder-controller/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/cinder-controller/templates/api-paste.ini (100%) rename ansible/{openstack_juno => }/roles/cinder-controller/templates/cinder.conf (100%) rename ansible/{openstack_juno => }/roles/cinder-controller/templates/cinder_init.sh (100%) rename ansible/{openstack_juno => }/roles/cinder-volume/files/loop.yml (100%) rename ansible/{openstack_juno => }/roles/cinder-volume/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/cinder-volume/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/cinder-volume/templates/cinder.conf (100%) rename ansible/{openstack_juno => }/roles/common/files/sources.list.d/cloudarchive-juno.list (100%) rename ansible/{openstack_juno => }/roles/common/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/common/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/common/templates/hosts (100%) rename ansible/{openstack_juno => }/roles/common/templates/ntp.conf (100%) rename ansible/{openstack_juno => }/roles/dashboard/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/dashboard/templates/local_settings.py (100%) rename ansible/{openstack_juno => }/roles/dashboard/templates/openstack-dashboard.conf (100%) rename ansible/{openstack_juno => }/roles/database/files/my.cnf (100%) rename ansible/{openstack_juno => }/roles/database/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/database/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/glance/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/glance/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/glance/templates/glance-api.conf (100%) rename ansible/{openstack_juno => }/roles/glance/templates/glance-registry.conf (100%) rename ansible/{openstack_juno => }/roles/glance/templates/image_upload.sh (100%) rename ansible/{openstack_juno => }/roles/keystone/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/keystone/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/keystone/templates/admin-openrc.sh (100%) rename ansible/{openstack_juno => }/roles/keystone/templates/demo-openrc.sh (100%) rename ansible/{openstack_juno => }/roles/keystone/templates/keystone.conf (100%) rename ansible/{openstack_juno => }/roles/keystone/templates/keystone_init (100%) rename ansible/{openstack_juno => }/roles/mq/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/mq/tasks/rabbitmq.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-common/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/defaults/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/dhcp_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/dnsmasq-neutron.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/etc/xorp/config.boot (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/l3_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/metadata_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/ml2_conf.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/neutron-network.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/neutron.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/neutron_init.sh (100%) rename ansible/{openstack_juno => }/roles/neutron-compute/templates/nova.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/dhcp_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/dnsmasq-neutron.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/etc/xorp/config.boot (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/l3_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/metadata_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/ml2_conf.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/neutron-network.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/neutron.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/neutron_init.sh (100%) rename ansible/{openstack_juno => }/roles/neutron-controller/templates/nova.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-network/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-network/tasks/igmp-router.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-network/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-network/tasks/odl.yml (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/dhcp_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/dnsmasq-neutron.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/etc/xorp/config.boot (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/l3_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/metadata_agent.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/ml2_conf.ini (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/neutron-network.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/neutron.conf (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/neutron_init.sh (100%) rename ansible/{openstack_juno => }/roles/neutron-network/templates/nova.conf (100%) rename ansible/{openstack_juno => }/roles/nova-compute/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/nova-compute/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/nova-compute/templates/nova-compute.conf (100%) rename ansible/{openstack_juno => }/roles/nova-compute/templates/nova.conf (100%) rename ansible/{openstack_juno => }/roles/nova-controller/handlers/main.yml (100%) rename ansible/{openstack_juno => }/roles/nova-controller/tasks/main.yml (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/dhcp_agent.ini (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/dnsmasq-neutron.conf (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/etc/xorp/config.boot (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/l3_agent.ini (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/metadata_agent.ini (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/ml2_conf.ini (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/neutron-network.conf (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/neutron.conf (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/neutron_init.sh (100%) rename ansible/{openstack_juno => }/roles/nova-controller/templates/nova.conf (100%) diff --git a/ansible/openstack_juno/roles/cinder-controller/handlers/main.yml b/ansible/roles/cinder-controller/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/cinder-controller/handlers/main.yml rename to ansible/roles/cinder-controller/handlers/main.yml diff --git a/ansible/openstack_juno/roles/cinder-controller/tasks/main.yml b/ansible/roles/cinder-controller/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/cinder-controller/tasks/main.yml rename to ansible/roles/cinder-controller/tasks/main.yml diff --git a/ansible/openstack_juno/roles/cinder-controller/templates/api-paste.ini b/ansible/roles/cinder-controller/templates/api-paste.ini similarity index 100% rename from ansible/openstack_juno/roles/cinder-controller/templates/api-paste.ini rename to ansible/roles/cinder-controller/templates/api-paste.ini diff --git a/ansible/openstack_juno/roles/cinder-controller/templates/cinder.conf b/ansible/roles/cinder-controller/templates/cinder.conf similarity index 100% rename from ansible/openstack_juno/roles/cinder-controller/templates/cinder.conf rename to ansible/roles/cinder-controller/templates/cinder.conf diff --git a/ansible/openstack_juno/roles/cinder-controller/templates/cinder_init.sh b/ansible/roles/cinder-controller/templates/cinder_init.sh similarity index 100% rename from ansible/openstack_juno/roles/cinder-controller/templates/cinder_init.sh rename to ansible/roles/cinder-controller/templates/cinder_init.sh diff --git a/ansible/openstack_juno/roles/cinder-volume/files/loop.yml b/ansible/roles/cinder-volume/files/loop.yml similarity index 100% rename from ansible/openstack_juno/roles/cinder-volume/files/loop.yml rename to ansible/roles/cinder-volume/files/loop.yml diff --git a/ansible/openstack_juno/roles/cinder-volume/handlers/main.yml b/ansible/roles/cinder-volume/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/cinder-volume/handlers/main.yml rename to ansible/roles/cinder-volume/handlers/main.yml diff --git a/ansible/openstack_juno/roles/cinder-volume/tasks/main.yml b/ansible/roles/cinder-volume/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/cinder-volume/tasks/main.yml rename to ansible/roles/cinder-volume/tasks/main.yml diff --git a/ansible/openstack_juno/roles/cinder-volume/templates/cinder.conf b/ansible/roles/cinder-volume/templates/cinder.conf similarity index 100% rename from ansible/openstack_juno/roles/cinder-volume/templates/cinder.conf rename to ansible/roles/cinder-volume/templates/cinder.conf diff --git a/ansible/openstack_juno/roles/common/files/sources.list.d/cloudarchive-juno.list b/ansible/roles/common/files/sources.list.d/cloudarchive-juno.list similarity index 100% rename from ansible/openstack_juno/roles/common/files/sources.list.d/cloudarchive-juno.list rename to ansible/roles/common/files/sources.list.d/cloudarchive-juno.list diff --git a/ansible/openstack_juno/roles/common/handlers/main.yml b/ansible/roles/common/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/common/handlers/main.yml rename to ansible/roles/common/handlers/main.yml diff --git a/ansible/openstack_juno/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/common/tasks/main.yml rename to ansible/roles/common/tasks/main.yml diff --git a/ansible/openstack_juno/roles/common/templates/hosts b/ansible/roles/common/templates/hosts similarity index 100% rename from ansible/openstack_juno/roles/common/templates/hosts rename to ansible/roles/common/templates/hosts diff --git a/ansible/openstack_juno/roles/common/templates/ntp.conf b/ansible/roles/common/templates/ntp.conf similarity index 100% rename from ansible/openstack_juno/roles/common/templates/ntp.conf rename to ansible/roles/common/templates/ntp.conf diff --git a/ansible/openstack_juno/roles/dashboard/tasks/main.yml b/ansible/roles/dashboard/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/dashboard/tasks/main.yml rename to ansible/roles/dashboard/tasks/main.yml diff --git a/ansible/openstack_juno/roles/dashboard/templates/local_settings.py b/ansible/roles/dashboard/templates/local_settings.py similarity index 100% rename from ansible/openstack_juno/roles/dashboard/templates/local_settings.py rename to ansible/roles/dashboard/templates/local_settings.py diff --git a/ansible/openstack_juno/roles/dashboard/templates/openstack-dashboard.conf b/ansible/roles/dashboard/templates/openstack-dashboard.conf similarity index 100% rename from ansible/openstack_juno/roles/dashboard/templates/openstack-dashboard.conf rename to ansible/roles/dashboard/templates/openstack-dashboard.conf diff --git a/ansible/openstack_juno/roles/database/files/my.cnf b/ansible/roles/database/files/my.cnf similarity index 100% rename from ansible/openstack_juno/roles/database/files/my.cnf rename to ansible/roles/database/files/my.cnf diff --git a/ansible/openstack_juno/roles/database/handlers/main.yml b/ansible/roles/database/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/database/handlers/main.yml rename to ansible/roles/database/handlers/main.yml diff --git a/ansible/openstack_juno/roles/database/tasks/main.yml b/ansible/roles/database/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/database/tasks/main.yml rename to ansible/roles/database/tasks/main.yml diff --git a/ansible/openstack_juno/roles/glance/handlers/main.yml b/ansible/roles/glance/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/glance/handlers/main.yml rename to ansible/roles/glance/handlers/main.yml diff --git a/ansible/openstack_juno/roles/glance/tasks/main.yml b/ansible/roles/glance/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/glance/tasks/main.yml rename to ansible/roles/glance/tasks/main.yml diff --git a/ansible/openstack_juno/roles/glance/templates/glance-api.conf b/ansible/roles/glance/templates/glance-api.conf similarity index 100% rename from ansible/openstack_juno/roles/glance/templates/glance-api.conf rename to ansible/roles/glance/templates/glance-api.conf diff --git a/ansible/openstack_juno/roles/glance/templates/glance-registry.conf b/ansible/roles/glance/templates/glance-registry.conf similarity index 100% rename from ansible/openstack_juno/roles/glance/templates/glance-registry.conf rename to ansible/roles/glance/templates/glance-registry.conf diff --git a/ansible/openstack_juno/roles/glance/templates/image_upload.sh b/ansible/roles/glance/templates/image_upload.sh similarity index 100% rename from ansible/openstack_juno/roles/glance/templates/image_upload.sh rename to ansible/roles/glance/templates/image_upload.sh diff --git a/ansible/openstack_juno/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/keystone/handlers/main.yml rename to ansible/roles/keystone/handlers/main.yml diff --git a/ansible/openstack_juno/roles/keystone/tasks/main.yml b/ansible/roles/keystone/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/keystone/tasks/main.yml rename to ansible/roles/keystone/tasks/main.yml diff --git a/ansible/openstack_juno/roles/keystone/templates/admin-openrc.sh b/ansible/roles/keystone/templates/admin-openrc.sh similarity index 100% rename from ansible/openstack_juno/roles/keystone/templates/admin-openrc.sh rename to ansible/roles/keystone/templates/admin-openrc.sh diff --git a/ansible/openstack_juno/roles/keystone/templates/demo-openrc.sh b/ansible/roles/keystone/templates/demo-openrc.sh similarity index 100% rename from ansible/openstack_juno/roles/keystone/templates/demo-openrc.sh rename to ansible/roles/keystone/templates/demo-openrc.sh diff --git a/ansible/openstack_juno/roles/keystone/templates/keystone.conf b/ansible/roles/keystone/templates/keystone.conf similarity index 100% rename from ansible/openstack_juno/roles/keystone/templates/keystone.conf rename to ansible/roles/keystone/templates/keystone.conf diff --git a/ansible/openstack_juno/roles/keystone/templates/keystone_init b/ansible/roles/keystone/templates/keystone_init similarity index 100% rename from ansible/openstack_juno/roles/keystone/templates/keystone_init rename to ansible/roles/keystone/templates/keystone_init diff --git a/ansible/openstack_juno/roles/mq/tasks/main.yml b/ansible/roles/mq/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/mq/tasks/main.yml rename to ansible/roles/mq/tasks/main.yml diff --git a/ansible/openstack_juno/roles/mq/tasks/rabbitmq.yml b/ansible/roles/mq/tasks/rabbitmq.yml similarity index 100% rename from ansible/openstack_juno/roles/mq/tasks/rabbitmq.yml rename to ansible/roles/mq/tasks/rabbitmq.yml diff --git a/ansible/openstack_juno/roles/neutron-common/handlers/main.yml b/ansible/roles/neutron-common/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-common/handlers/main.yml rename to ansible/roles/neutron-common/handlers/main.yml diff --git a/ansible/openstack_juno/roles/neutron-compute/defaults/main.yml b/ansible/roles/neutron-compute/defaults/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/defaults/main.yml rename to ansible/roles/neutron-compute/defaults/main.yml diff --git a/ansible/openstack_juno/roles/neutron-compute/handlers/main.yml b/ansible/roles/neutron-compute/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/handlers/main.yml rename to ansible/roles/neutron-compute/handlers/main.yml diff --git a/ansible/openstack_juno/roles/neutron-compute/tasks/main.yml b/ansible/roles/neutron-compute/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/tasks/main.yml rename to ansible/roles/neutron-compute/tasks/main.yml diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/dhcp_agent.ini b/ansible/roles/neutron-compute/templates/dhcp_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/dhcp_agent.ini rename to ansible/roles/neutron-compute/templates/dhcp_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/dnsmasq-neutron.conf b/ansible/roles/neutron-compute/templates/dnsmasq-neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/dnsmasq-neutron.conf rename to ansible/roles/neutron-compute/templates/dnsmasq-neutron.conf diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/etc/xorp/config.boot b/ansible/roles/neutron-compute/templates/etc/xorp/config.boot similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/etc/xorp/config.boot rename to ansible/roles/neutron-compute/templates/etc/xorp/config.boot diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/l3_agent.ini b/ansible/roles/neutron-compute/templates/l3_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/l3_agent.ini rename to ansible/roles/neutron-compute/templates/l3_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/metadata_agent.ini b/ansible/roles/neutron-compute/templates/metadata_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/metadata_agent.ini rename to ansible/roles/neutron-compute/templates/metadata_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/ml2_conf.ini b/ansible/roles/neutron-compute/templates/ml2_conf.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/ml2_conf.ini rename to ansible/roles/neutron-compute/templates/ml2_conf.ini diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/neutron-network.conf b/ansible/roles/neutron-compute/templates/neutron-network.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/neutron-network.conf rename to ansible/roles/neutron-compute/templates/neutron-network.conf diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/neutron.conf b/ansible/roles/neutron-compute/templates/neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/neutron.conf rename to ansible/roles/neutron-compute/templates/neutron.conf diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/neutron_init.sh b/ansible/roles/neutron-compute/templates/neutron_init.sh similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/neutron_init.sh rename to ansible/roles/neutron-compute/templates/neutron_init.sh diff --git a/ansible/openstack_juno/roles/neutron-compute/templates/nova.conf b/ansible/roles/neutron-compute/templates/nova.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-compute/templates/nova.conf rename to ansible/roles/neutron-compute/templates/nova.conf diff --git a/ansible/openstack_juno/roles/neutron-controller/handlers/main.yml b/ansible/roles/neutron-controller/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/handlers/main.yml rename to ansible/roles/neutron-controller/handlers/main.yml diff --git a/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml b/ansible/roles/neutron-controller/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/tasks/main.yml rename to ansible/roles/neutron-controller/tasks/main.yml diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/dhcp_agent.ini b/ansible/roles/neutron-controller/templates/dhcp_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/dhcp_agent.ini rename to ansible/roles/neutron-controller/templates/dhcp_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/dnsmasq-neutron.conf b/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/dnsmasq-neutron.conf rename to ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/etc/xorp/config.boot b/ansible/roles/neutron-controller/templates/etc/xorp/config.boot similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/etc/xorp/config.boot rename to ansible/roles/neutron-controller/templates/etc/xorp/config.boot diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/l3_agent.ini b/ansible/roles/neutron-controller/templates/l3_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/l3_agent.ini rename to ansible/roles/neutron-controller/templates/l3_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/metadata_agent.ini b/ansible/roles/neutron-controller/templates/metadata_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/metadata_agent.ini rename to ansible/roles/neutron-controller/templates/metadata_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/ml2_conf.ini b/ansible/roles/neutron-controller/templates/ml2_conf.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/ml2_conf.ini rename to ansible/roles/neutron-controller/templates/ml2_conf.ini diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/neutron-network.conf b/ansible/roles/neutron-controller/templates/neutron-network.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/neutron-network.conf rename to ansible/roles/neutron-controller/templates/neutron-network.conf diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/neutron.conf b/ansible/roles/neutron-controller/templates/neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/neutron.conf rename to ansible/roles/neutron-controller/templates/neutron.conf diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/neutron_init.sh b/ansible/roles/neutron-controller/templates/neutron_init.sh similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/neutron_init.sh rename to ansible/roles/neutron-controller/templates/neutron_init.sh diff --git a/ansible/openstack_juno/roles/neutron-controller/templates/nova.conf b/ansible/roles/neutron-controller/templates/nova.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-controller/templates/nova.conf rename to ansible/roles/neutron-controller/templates/nova.conf diff --git a/ansible/openstack_juno/roles/neutron-network/handlers/main.yml b/ansible/roles/neutron-network/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/handlers/main.yml rename to ansible/roles/neutron-network/handlers/main.yml diff --git a/ansible/openstack_juno/roles/neutron-network/tasks/igmp-router.yml b/ansible/roles/neutron-network/tasks/igmp-router.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/tasks/igmp-router.yml rename to ansible/roles/neutron-network/tasks/igmp-router.yml diff --git a/ansible/openstack_juno/roles/neutron-network/tasks/main.yml b/ansible/roles/neutron-network/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/tasks/main.yml rename to ansible/roles/neutron-network/tasks/main.yml diff --git a/ansible/openstack_juno/roles/neutron-network/tasks/odl.yml b/ansible/roles/neutron-network/tasks/odl.yml similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/tasks/odl.yml rename to ansible/roles/neutron-network/tasks/odl.yml diff --git a/ansible/openstack_juno/roles/neutron-network/templates/dhcp_agent.ini b/ansible/roles/neutron-network/templates/dhcp_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/dhcp_agent.ini rename to ansible/roles/neutron-network/templates/dhcp_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-network/templates/dnsmasq-neutron.conf b/ansible/roles/neutron-network/templates/dnsmasq-neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/dnsmasq-neutron.conf rename to ansible/roles/neutron-network/templates/dnsmasq-neutron.conf diff --git a/ansible/openstack_juno/roles/neutron-network/templates/etc/xorp/config.boot b/ansible/roles/neutron-network/templates/etc/xorp/config.boot similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/etc/xorp/config.boot rename to ansible/roles/neutron-network/templates/etc/xorp/config.boot diff --git a/ansible/openstack_juno/roles/neutron-network/templates/l3_agent.ini b/ansible/roles/neutron-network/templates/l3_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/l3_agent.ini rename to ansible/roles/neutron-network/templates/l3_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-network/templates/metadata_agent.ini b/ansible/roles/neutron-network/templates/metadata_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/metadata_agent.ini rename to ansible/roles/neutron-network/templates/metadata_agent.ini diff --git a/ansible/openstack_juno/roles/neutron-network/templates/ml2_conf.ini b/ansible/roles/neutron-network/templates/ml2_conf.ini similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/ml2_conf.ini rename to ansible/roles/neutron-network/templates/ml2_conf.ini diff --git a/ansible/openstack_juno/roles/neutron-network/templates/neutron-network.conf b/ansible/roles/neutron-network/templates/neutron-network.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/neutron-network.conf rename to ansible/roles/neutron-network/templates/neutron-network.conf diff --git a/ansible/openstack_juno/roles/neutron-network/templates/neutron.conf b/ansible/roles/neutron-network/templates/neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/neutron.conf rename to ansible/roles/neutron-network/templates/neutron.conf diff --git a/ansible/openstack_juno/roles/neutron-network/templates/neutron_init.sh b/ansible/roles/neutron-network/templates/neutron_init.sh similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/neutron_init.sh rename to ansible/roles/neutron-network/templates/neutron_init.sh diff --git a/ansible/openstack_juno/roles/neutron-network/templates/nova.conf b/ansible/roles/neutron-network/templates/nova.conf similarity index 100% rename from ansible/openstack_juno/roles/neutron-network/templates/nova.conf rename to ansible/roles/neutron-network/templates/nova.conf diff --git a/ansible/openstack_juno/roles/nova-compute/handlers/main.yml b/ansible/roles/nova-compute/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/nova-compute/handlers/main.yml rename to ansible/roles/nova-compute/handlers/main.yml diff --git a/ansible/openstack_juno/roles/nova-compute/tasks/main.yml b/ansible/roles/nova-compute/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/nova-compute/tasks/main.yml rename to ansible/roles/nova-compute/tasks/main.yml diff --git a/ansible/openstack_juno/roles/nova-compute/templates/nova-compute.conf b/ansible/roles/nova-compute/templates/nova-compute.conf similarity index 100% rename from ansible/openstack_juno/roles/nova-compute/templates/nova-compute.conf rename to ansible/roles/nova-compute/templates/nova-compute.conf diff --git a/ansible/openstack_juno/roles/nova-compute/templates/nova.conf b/ansible/roles/nova-compute/templates/nova.conf similarity index 100% rename from ansible/openstack_juno/roles/nova-compute/templates/nova.conf rename to ansible/roles/nova-compute/templates/nova.conf diff --git a/ansible/openstack_juno/roles/nova-controller/handlers/main.yml b/ansible/roles/nova-controller/handlers/main.yml similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/handlers/main.yml rename to ansible/roles/nova-controller/handlers/main.yml diff --git a/ansible/openstack_juno/roles/nova-controller/tasks/main.yml b/ansible/roles/nova-controller/tasks/main.yml similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/tasks/main.yml rename to ansible/roles/nova-controller/tasks/main.yml diff --git a/ansible/openstack_juno/roles/nova-controller/templates/dhcp_agent.ini b/ansible/roles/nova-controller/templates/dhcp_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/dhcp_agent.ini rename to ansible/roles/nova-controller/templates/dhcp_agent.ini diff --git a/ansible/openstack_juno/roles/nova-controller/templates/dnsmasq-neutron.conf b/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/dnsmasq-neutron.conf rename to ansible/roles/nova-controller/templates/dnsmasq-neutron.conf diff --git a/ansible/openstack_juno/roles/nova-controller/templates/etc/xorp/config.boot b/ansible/roles/nova-controller/templates/etc/xorp/config.boot similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/etc/xorp/config.boot rename to ansible/roles/nova-controller/templates/etc/xorp/config.boot diff --git a/ansible/openstack_juno/roles/nova-controller/templates/l3_agent.ini b/ansible/roles/nova-controller/templates/l3_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/l3_agent.ini rename to ansible/roles/nova-controller/templates/l3_agent.ini diff --git a/ansible/openstack_juno/roles/nova-controller/templates/metadata_agent.ini b/ansible/roles/nova-controller/templates/metadata_agent.ini similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/metadata_agent.ini rename to ansible/roles/nova-controller/templates/metadata_agent.ini diff --git a/ansible/openstack_juno/roles/nova-controller/templates/ml2_conf.ini b/ansible/roles/nova-controller/templates/ml2_conf.ini similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/ml2_conf.ini rename to ansible/roles/nova-controller/templates/ml2_conf.ini diff --git a/ansible/openstack_juno/roles/nova-controller/templates/neutron-network.conf b/ansible/roles/nova-controller/templates/neutron-network.conf similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/neutron-network.conf rename to ansible/roles/nova-controller/templates/neutron-network.conf diff --git a/ansible/openstack_juno/roles/nova-controller/templates/neutron.conf b/ansible/roles/nova-controller/templates/neutron.conf similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/neutron.conf rename to ansible/roles/nova-controller/templates/neutron.conf diff --git a/ansible/openstack_juno/roles/nova-controller/templates/neutron_init.sh b/ansible/roles/nova-controller/templates/neutron_init.sh similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/neutron_init.sh rename to ansible/roles/nova-controller/templates/neutron_init.sh diff --git a/ansible/openstack_juno/roles/nova-controller/templates/nova.conf b/ansible/roles/nova-controller/templates/nova.conf similarity index 100% rename from ansible/openstack_juno/roles/nova-controller/templates/nova.conf rename to ansible/roles/nova-controller/templates/nova.conf