From d6e99bb0819b1e0675ea642fd81f5bfcd568ebfb Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Tue, 30 Jun 2015 14:53:17 +0800 Subject: [PATCH] update ansible roles directory for supporting commpass-core installing BGS-80 Change-Id: I97a5d2a9b1f6c799c1976ec1cf6e687b108e0d0f Signed-off-by: carey.xu --- .../openstack_juno/roles/keystone/handlers/main.yml | 3 --- .../ansible/openstack_juno/roles/repo/tasks/main.yml | 14 -------------- .../roles/cinder-controller/handlers/main.yml | 0 .../roles/cinder-controller/tasks/cinder_config.yml | 0 .../roles/cinder-controller/tasks/cinder_install.yml | 0 .../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 .../roles/cinder-volume/files/loop.yml | 0 .../roles/cinder-volume/handlers/main.yml | 1 - .../roles/cinder-volume/tasks/main.yml | 0 .../roles/cinder-volume/templates/cinder.conf | 0 .../files/sources.list.d/cloudarchive-juno.list | 0 .../{openstack_juno => }/roles/common/tasks/main.yml | 0 .../{openstack_juno => }/roles/common/templates/hosts | 0 .../roles/common/templates/ntp.conf | 0 .../roles/dashboard/tasks/main.yml | 0 .../roles/dashboard/templates/local_settings.py | 0 .../dashboard/templates/openstack-dashboard.conf | 0 .../{openstack_juno => }/roles/database/files/my.cnf | 0 .../roles/database/tasks/main.yml | 0 .../roles/database/tasks/mariadb.yml | 19 ++----------------- .../roles/database/tasks/mysql.yml | 0 .../roles/database/templates/data.j2 | 0 .../roles/database/templates/my.cnf | 0 .../roles/database/templates/wsrep.cnf | 0 .../roles/glance/handlers/main.yml | 0 .../roles/glance/tasks/glance_config.yml | 0 .../roles/glance/tasks/glance_install.yml | 0 .../{openstack_juno => }/roles/glance/tasks/main.yml | 0 .../{openstack_juno => }/roles/glance/tasks/nfs.yml | 0 .../roles/glance/templates/glance-api.conf | 0 .../roles/glance/templates/glance-registry.conf | 0 .../roles/glance/templates/image_upload.sh | 0 .../{openstack_juno => }/roles/ha/files/galera_chk | 0 .../{openstack_juno => }/roles/ha/files/mysqlchk | 0 .../{openstack_juno => }/roles/ha/files/notify.sh | 0 .../{openstack_juno => }/roles/ha/handlers/main.yml | 0 .../{openstack_juno => }/roles/ha/tasks/main.yml | 0 .../roles/ha/templates/failover.j2 | 0 .../roles/ha/templates/haproxy.cfg | 0 .../roles/ha/templates/keepalived.conf | 0 .../roles/keystone/tasks/keystone_config.yml | 0 .../roles/keystone/tasks/keystone_install.yml | 4 +++- .../roles/keystone/tasks/main.yml | 0 .../roles/keystone/templates/admin-openrc.sh | 0 .../roles/keystone/templates/demo-openrc.sh | 0 .../roles/keystone/templates/keystone.conf | 4 ++-- .../roles/keystone/templates/keystone_init | 0 .../roles/monitor/files/check_service.sh | 0 .../{openstack_juno => }/roles/monitor/files/root | 0 .../{openstack_juno => }/roles/monitor/tasks/main.yml | 0 .../{openstack_juno => }/roles/mq/tasks/main.yml | 0 .../{openstack_juno => }/roles/mq/tasks/rabbitmq.yml | 0 .../roles/mq/tasks/rabbitmq_cluster.yml | 0 .../roles/mq/templates/.erlang.cookie | 0 .../roles/mq/templates/rabbitmq-env.conf | 0 .../roles/neutron-common/handlers/main.yml | 0 .../roles/neutron-compute/defaults/main.yml | 0 .../roles/neutron-compute/handlers/main.yml | 0 .../roles/neutron-compute/tasks/main.yml | 0 .../roles/neutron-compute/templates/dhcp_agent.ini | 0 .../neutron-compute/templates/dnsmasq-neutron.conf | 0 .../neutron-compute/templates/etc/xorp/config.boot | 0 .../roles/neutron-compute/templates/l3_agent.ini | 0 .../neutron-compute/templates/metadata_agent.ini | 0 .../roles/neutron-compute/templates/ml2_conf.ini | 0 .../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 .../roles/neutron-controller/tasks/main.yml | 0 .../roles/neutron-controller/tasks/neutron_config.yml | 0 .../neutron-controller/tasks/neutron_install.yml | 0 .../roles/neutron-controller/templates/dhcp_agent.ini | 0 .../neutron-controller/templates/dnsmasq-neutron.conf | 0 .../neutron-controller/templates/etc/xorp/config.boot | 0 .../roles/neutron-controller/templates/l3_agent.ini | 0 .../neutron-controller/templates/metadata_agent.ini | 0 .../roles/neutron-controller/templates/ml2_conf.ini | 0 .../neutron-controller/templates/neutron-network.conf | 0 .../roles/neutron-controller/templates/neutron.conf | 0 .../neutron-controller/templates/neutron_init.sh | 0 .../roles/neutron-controller/templates/nova.conf | 0 .../roles/neutron-network/handlers/main.yml | 0 .../roles/neutron-network/tasks/igmp-router.yml | 0 .../roles/neutron-network/tasks/main.yml | 0 .../roles/neutron-network/tasks/odl.yml | 0 .../roles/neutron-network/templates/dhcp_agent.ini | 0 .../neutron-network/templates/dnsmasq-neutron.conf | 0 .../neutron-network/templates/etc/xorp/config.boot | 0 .../roles/neutron-network/templates/l3_agent.ini | 0 .../neutron-network/templates/metadata_agent.ini | 0 .../roles/neutron-network/templates/ml2_conf.ini | 0 .../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 .../roles/nova-compute/handlers/main.yml | 0 .../roles/nova-compute/tasks/main.yml | 0 .../roles/nova-compute/templates/nova-compute.conf | 0 .../roles/nova-compute/templates/nova.conf | 0 .../roles/nova-controller/handlers/main.yml | 0 .../roles/nova-controller/tasks/main.yml | 0 .../roles/nova-controller/tasks/nova_config.yml | 0 .../roles/nova-controller/tasks/nova_install.yml | 0 .../roles/nova-controller/templates/dhcp_agent.ini | 0 .../nova-controller/templates/dnsmasq-neutron.conf | 0 .../nova-controller/templates/etc/xorp/config.boot | 0 .../roles/nova-controller/templates/l3_agent.ini | 0 .../nova-controller/templates/metadata_agent.ini | 0 .../roles/nova-controller/templates/ml2_conf.ini | 0 .../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 compass/deploy/ansible/roles/repo/tasks/main.yml | 6 ++++++ .../roles/repo/templates/sources.list | 0 120 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml delete mode 100644 compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-controller/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-controller/tasks/cinder_config.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-controller/tasks/cinder_install.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-controller/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-controller/templates/api-paste.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-controller/templates/cinder.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-controller/templates/cinder_init.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-volume/files/loop.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-volume/handlers/main.yml (98%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-volume/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/cinder-volume/templates/cinder.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/common/files/sources.list.d/cloudarchive-juno.list (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/common/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/common/templates/hosts (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/common/templates/ntp.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/dashboard/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/dashboard/templates/local_settings.py (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/dashboard/templates/openstack-dashboard.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/database/files/my.cnf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/database/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/database/tasks/mariadb.yml (72%) rename compass/deploy/ansible/{openstack_juno => }/roles/database/tasks/mysql.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/database/templates/data.j2 (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/database/templates/my.cnf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/database/templates/wsrep.cnf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/tasks/glance_config.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/tasks/glance_install.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/tasks/nfs.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/templates/glance-api.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/templates/glance-registry.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/glance/templates/image_upload.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/files/galera_chk (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/files/mysqlchk (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/files/notify.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/templates/failover.j2 (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/templates/haproxy.cfg (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/ha/templates/keepalived.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/keystone/tasks/keystone_config.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/keystone/tasks/keystone_install.yml (91%) rename compass/deploy/ansible/{openstack_juno => }/roles/keystone/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/keystone/templates/admin-openrc.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/keystone/templates/demo-openrc.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/keystone/templates/keystone.conf (99%) rename compass/deploy/ansible/{openstack_juno => }/roles/keystone/templates/keystone_init (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/monitor/files/check_service.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/monitor/files/root (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/monitor/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/mq/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/mq/tasks/rabbitmq.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/mq/tasks/rabbitmq_cluster.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/mq/templates/.erlang.cookie (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/mq/templates/rabbitmq-env.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-common/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/defaults/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/dhcp_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/dnsmasq-neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/etc/xorp/config.boot (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/l3_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/metadata_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/ml2_conf.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/neutron-network.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/neutron_init.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-compute/templates/nova.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/tasks/neutron_config.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/tasks/neutron_install.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/dhcp_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/dnsmasq-neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/etc/xorp/config.boot (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/l3_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/metadata_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/ml2_conf.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/neutron-network.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/neutron_init.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-controller/templates/nova.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/tasks/igmp-router.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/tasks/odl.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/dhcp_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/dnsmasq-neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/etc/xorp/config.boot (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/l3_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/metadata_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/ml2_conf.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/neutron-network.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/neutron_init.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/neutron-network/templates/nova.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-compute/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-compute/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-compute/templates/nova-compute.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-compute/templates/nova.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/handlers/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/tasks/main.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/tasks/nova_config.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/tasks/nova_install.yml (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/dhcp_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/dnsmasq-neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/etc/xorp/config.boot (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/l3_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/metadata_agent.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/ml2_conf.ini (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/neutron-network.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/neutron.conf (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/neutron_init.sh (100%) rename compass/deploy/ansible/{openstack_juno => }/roles/nova-controller/templates/nova.conf (100%) create mode 100644 compass/deploy/ansible/roles/repo/tasks/main.yml rename compass/deploy/ansible/{openstack_juno => }/roles/repo/templates/sources.list (100%) diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml b/compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml deleted file mode 100644 index 9c0084e..0000000 --- a/compass/deploy/ansible/openstack_juno/roles/keystone/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: restart keystone - service: name=keystone state=restarted enabled=yes diff --git a/compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml b/compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml deleted file mode 100644 index 21f4ef0..0000000 --- a/compass/deploy/ansible/openstack_juno/roles/repo/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: copy local sources.list - template: src=sources.list dest=/etc/apt/sources.list backup=yes - when: LOCAL_REPO is defined - -- name: copy deb packages - shell: cp -rf /opt/repo/pool/main/ /var/cache/apt/archive/ - ignore_errors: True - -- name: add juno cloudarchive - apt_repository: repo="{{ juno_cloud_archive }}" state=present - -- name: first update pkgs - apt: update_cache=yes diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-controller/handlers/main.yml b/compass/deploy/ansible/roles/cinder-controller/handlers/main.yml 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 --- a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/handlers/main.yml +++ b/compass/deploy/ansible/roles/cinder-volume/handlers/main.yml @@ -1,4 +1,3 @@ --- - name: restart cinder-volume service: name=cinder-volume state=restarted enabled=yes - diff --git a/compass/deploy/ansible/openstack_juno/roles/cinder-volume/tasks/main.yml b/compass/deploy/ansible/roles/cinder-volume/tasks/main.yml 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 --- a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml +++ b/compass/deploy/ansible/roles/database/tasks/mariadb.yml @@ -7,22 +7,8 @@ #- mariadb-client-5.5 - mysql-client-5.5 - python-mysqldb - -- name: download mariadb and galera deb package - get_url: url={{ item.url }} dest=/opt/{{ item.filename }} - register: result - until: result|success - retries: 5 - delay: 3 - with_items: - - { url: "{{ MARIADB_URL }}", filename: "{{ MARIADB }}" } - - { url: "{{ GALERA_URL }}", filename: "{{ GALERA }}" } - -- name: install mariadb and galera packages - command: dpkg -i /opt/{{ item }} - with_items: - - "{{ MARIADB }}" - - "{{ GALERA }}" + - mysql-server-wsrep + - galera - name: create mysql log directy file: path=/var/log/mysql state=directory owner=mysql group=mysql mode=0755 @@ -53,7 +39,6 @@ with_items: - mysql - - name: create database/user shell: /opt/data.sh when: HA_CLUSTER[inventory_hostname] == '' diff --git a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml b/compass/deploy/ansible/roles/database/tasks/mysql.yml 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 --- a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/keystone_install.yml +++ b/compass/deploy/ansible/roles/keystone/tasks/keystone_install.yml @@ -9,7 +9,6 @@ - name: update keystone conf template: src=keystone.conf dest=/etc/keystone/keystone.conf backup=yes - notify: restart keystone - name: delete sqlite database shell: rm /var/lib/keystone/keystone.db || echo sqllite database already removed @@ -25,3 +24,6 @@ with_items: - admin-openrc.sh - demo-openrc.sh + +- name: manually start keystone + service: name=keystone state=restarted enabled=yes diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/tasks/main.yml b/compass/deploy/ansible/roles/keystone/tasks/main.yml 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 --- a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone.conf +++ b/compass/deploy/ansible/roles/keystone/templates/keystone.conf @@ -355,11 +355,11 @@ rabbit_password={{ RABBIT_PASS }} # Print debugging output (set logging level to DEBUG instead # of default WARNING level). (boolean value) -#debug=false +debug={{ DEBUG }} # Print more verbose output (set logging level to INFO instead # of default WARNING level). (boolean value) -#verbose=false +verbose={{ VERBOSE }} # Log output to standard error (boolean value) #use_stderr=true diff --git a/compass/deploy/ansible/openstack_juno/roles/keystone/templates/keystone_init b/compass/deploy/ansible/roles/keystone/templates/keystone_init 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 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 -- 2.16.6