Moving Ansible Stuff to its own subdirectory

To not mess with the root directory of this solution, we're moving Ansible stuff to its own subdirectory, called "ansible/".
adriantam · Oct 16, 2015 · 9aef4c2 · 9aef4c2
1 parent b458782
commit 9aef4c2
Show file tree

Hide file tree

Showing 50 changed files with 27 additions and 27 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -90,8 +90,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Ansible provisioner.
   config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "site.yml"
-    ansible.inventory_path = "hosts"
+    ansible.playbook = "ansible/site.yml"
+    ansible.inventory_path = "ansible/hosts"
     ansible.sudo = true
   end
 

diff --git a/ansible.cfg → ansible/ansible.cfg b/ansible.cfg → ansible/ansible.cfg
diff --git a/group_vars/all → ansible/group_vars/all b/group_vars/all → ansible/group_vars/all
diff --git a/hosts → ansible/hosts b/hosts → ansible/hosts
diff --git a/roles/bootstrap/files/htoprc → ansible/roles/bootstrap/files/htoprc b/roles/bootstrap/files/htoprc → ansible/roles/bootstrap/files/htoprc
diff --git a/roles/bootstrap/files/sources.list → ansible/roles/bootstrap/files/sources.list b/roles/bootstrap/files/sources.list → ansible/roles/bootstrap/files/sources.list
diff --git a/roles/bootstrap/tasks/main.yml → ansible/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml → ansible/roles/bootstrap/tasks/main.yml
diff --git a/roles/cinder/tasks/main.yml → ansible/roles/cinder/tasks/main.yml b/roles/cinder/tasks/main.yml → ansible/roles/cinder/tasks/main.yml
diff --git a/roles/cinder/templates/cinder.conf → ansible/roles/cinder/templates/cinder.conf b/roles/cinder/templates/cinder.conf → ansible/roles/cinder/templates/cinder.conf
diff --git a/roles/glance/tasks/default-images.yml → ...ble/roles/glance/tasks/default-images.yml b/roles/glance/tasks/default-images.yml → ...ble/roles/glance/tasks/default-images.yml
diff --git a/roles/glance/tasks/main.yml → ansible/roles/glance/tasks/main.yml b/roles/glance/tasks/main.yml → ansible/roles/glance/tasks/main.yml
diff --git a/roles/glance/templates/glance-api.conf → ...le/roles/glance/templates/glance-api.conf b/roles/glance/templates/glance-api.conf → ...le/roles/glance/templates/glance-api.conf
diff --git a/roles/glance/templates/glance-registry.conf → ...les/glance/templates/glance-registry.conf b/roles/glance/templates/glance-registry.conf → ...les/glance/templates/glance-registry.conf
diff --git a/roles/heat/tasks/main.yml → ansible/roles/heat/tasks/main.yml b/roles/heat/tasks/main.yml → ansible/roles/heat/tasks/main.yml
diff --git a/roles/heat/templates/heat.conf → ansible/roles/heat/templates/heat.conf b/roles/heat/templates/heat.conf → ansible/roles/heat/templates/heat.conf
diff --git a/roles/horizon/tasks/main.yml → ansible/roles/horizon/tasks/main.yml b/roles/horizon/tasks/main.yml → ansible/roles/horizon/tasks/main.yml
diff --git a/roles/horizon/templates/local_settings.py → ...roles/horizon/templates/local_settings.py b/roles/horizon/templates/local_settings.py → ...roles/horizon/templates/local_settings.py
diff --git a/...orizon/templates/openstack-dashboard.conf → ...orizon/templates/openstack-dashboard.conf b/...orizon/templates/openstack-dashboard.conf → ...orizon/templates/openstack-dashboard.conf
diff --git a/roles/keystone/tasks/main.yml → ansible/roles/keystone/tasks/main.yml b/roles/keystone/tasks/main.yml → ansible/roles/keystone/tasks/main.yml
diff --git a/roles/keystone/tasks/openrc-files.yml → ...ble/roles/keystone/tasks/openrc-files.yml b/roles/keystone/tasks/openrc-files.yml → ...ble/roles/keystone/tasks/openrc-files.yml
diff --git a/roles/keystone/tasks/openstack-endpoints.yml → ...es/keystone/tasks/openstack-endpoints.yml b/roles/keystone/tasks/openstack-endpoints.yml → ...es/keystone/tasks/openstack-endpoints.yml
diff --git a/roles/keystone/tasks/openstack-pur.yml → ...le/roles/keystone/tasks/openstack-pur.yml b/roles/keystone/tasks/openstack-pur.yml → ...le/roles/keystone/tasks/openstack-pur.yml
diff --git a/roles/keystone/tasks/openstack-services.yml → ...les/keystone/tasks/openstack-services.yml b/roles/keystone/tasks/openstack-services.yml → ...les/keystone/tasks/openstack-services.yml
diff --git a/roles/keystone/templates/admin-openrc.sh → .../roles/keystone/templates/admin-openrc.sh b/roles/keystone/templates/admin-openrc.sh → .../roles/keystone/templates/admin-openrc.sh
diff --git a/roles/keystone/templates/demo-openrc.sh → ...e/roles/keystone/templates/demo-openrc.sh b/roles/keystone/templates/demo-openrc.sh → ...e/roles/keystone/templates/demo-openrc.sh
diff --git a/roles/keystone/templates/keystone.conf → ...le/roles/keystone/templates/keystone.conf b/roles/keystone/templates/keystone.conf → ...le/roles/keystone/templates/keystone.conf
diff --git a/roles/memcached/files/memcached.conf → ansible/roles/memcached/files/memcached.conf b/roles/memcached/files/memcached.conf → ansible/roles/memcached/files/memcached.conf
diff --git a/roles/memcached/tasks/main.yml → ansible/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml → ansible/roles/memcached/tasks/main.yml
diff --git a/roles/mysql/files/my.cnf → ansible/roles/mysql/files/my.cnf b/roles/mysql/files/my.cnf → ansible/roles/mysql/files/my.cnf
diff --git a/roles/mysql/tasks/main.yml → ansible/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml → ansible/roles/mysql/tasks/main.yml
diff --git a/roles/neutron_aio/files/dnsmasq-neutron.conf → ...es/neutron_aio/files/dnsmasq-neutron.conf b/roles/neutron_aio/files/dnsmasq-neutron.conf → ...es/neutron_aio/files/dnsmasq-neutron.conf
diff --git a/roles/neutron_aio/files/sysctl.conf → ansible/roles/neutron_aio/files/sysctl.conf b/roles/neutron_aio/files/sysctl.conf → ansible/roles/neutron_aio/files/sysctl.conf
diff --git a/roles/neutron_aio/handlers/main.yml → ansible/roles/neutron_aio/handlers/main.yml b/roles/neutron_aio/handlers/main.yml → ansible/roles/neutron_aio/handlers/main.yml
diff --git a/roles/neutron_aio/tasks/main.yml → ansible/roles/neutron_aio/tasks/main.yml b/roles/neutron_aio/tasks/main.yml → ansible/roles/neutron_aio/tasks/main.yml
diff --git a/roles/neutron_aio/templates/dhcp_agent.ini → ...oles/neutron_aio/templates/dhcp_agent.ini b/roles/neutron_aio/templates/dhcp_agent.ini → ...oles/neutron_aio/templates/dhcp_agent.ini
diff --git a/roles/neutron_aio/templates/fwaas_driver.ini → ...es/neutron_aio/templates/fwaas_driver.ini b/roles/neutron_aio/templates/fwaas_driver.ini → ...es/neutron_aio/templates/fwaas_driver.ini
diff --git a/roles/neutron_aio/templates/l3_agent.ini → .../roles/neutron_aio/templates/l3_agent.ini b/roles/neutron_aio/templates/l3_agent.ini → .../roles/neutron_aio/templates/l3_agent.ini
diff --git a/.../neutron_aio/templates/metadata_agent.ini → .../neutron_aio/templates/metadata_agent.ini b/.../neutron_aio/templates/metadata_agent.ini → .../neutron_aio/templates/metadata_agent.ini
diff --git a/...on_aio/templates/ml2_conf.ini_linuxbridge → ...on_aio/templates/ml2_conf.ini_linuxbridge b/...on_aio/templates/ml2_conf.ini_linuxbridge → ...on_aio/templates/ml2_conf.ini_linuxbridge
diff --git a/roles/neutron_aio/templates/ml2_conf.ini_ovs → ...es/neutron_aio/templates/ml2_conf.ini_ovs b/roles/neutron_aio/templates/ml2_conf.ini_ovs → ...es/neutron_aio/templates/ml2_conf.ini_ovs
diff --git a/roles/neutron_aio/templates/neutron.conf → .../roles/neutron_aio/templates/neutron.conf b/roles/neutron_aio/templates/neutron.conf → .../roles/neutron_aio/templates/neutron.conf
diff --git a/roles/nova_aio/handlers/main.yml → ansible/roles/nova_aio/handlers/main.yml b/roles/nova_aio/handlers/main.yml → ansible/roles/nova_aio/handlers/main.yml
diff --git a/roles/nova_aio/tasks/main.yml → ansible/roles/nova_aio/tasks/main.yml b/roles/nova_aio/tasks/main.yml → ansible/roles/nova_aio/tasks/main.yml
diff --git a/...nova_aio/tasks/nova-flavors-standards.yml → ...nova_aio/tasks/nova-flavors-standards.yml b/...nova_aio/tasks/nova-flavors-standards.yml → ...nova_aio/tasks/nova-flavors-standards.yml
diff --git a/roles/nova_aio/templates/nova-compute.conf → ...oles/nova_aio/templates/nova-compute.conf b/roles/nova_aio/templates/nova-compute.conf → ...oles/nova_aio/templates/nova-compute.conf
diff --git a/roles/nova_aio/templates/nova.conf → ansible/roles/nova_aio/templates/nova.conf b/roles/nova_aio/templates/nova.conf → ansible/roles/nova_aio/templates/nova.conf
diff --git a/roles/rabbitmq/tasks/main.yml → ansible/roles/rabbitmq/tasks/main.yml b/roles/rabbitmq/tasks/main.yml → ansible/roles/rabbitmq/tasks/main.yml
diff --git a/site.yml → ansible/site.yml b/site.yml → ansible/site.yml
diff --git a/os-deploy-vagrant.sh b/os-deploy-vagrant.sh
@@ -47,15 +47,15 @@ fi
 
 echo
 echo "Configuring group_vars/all file based on current environment..."
-sed -i -e 's/controller-1.yourdomain.com/'$FQDN'/g' group_vars/all
-sed -i -e 's/yourdomain.com/'$DOMAIN'/g' group_vars/all
+sed -i -e 's/controller-1.yourdomain.com/'$FQDN'/g' ansible/group_vars/all
+sed -i -e 's/yourdomain.com/'$DOMAIN'/g' ansible/group_vars/all
 
 
 echo
 echo "Configuring site.yml and OpenStack OpenRC files with your current $WHOAMI user..."
-sed -i -e 's/administrative/'$WHOAMI'/g' site.yml
-sed -i -e 's/administrative/'$WHOAMI'/g' roles/keystone/tasks/main.yml
-sed -i -e 's/administrative/'$WHOAMI'/g' roles/heat/tasks/main.yml
+sed -i -e 's/administrative/'$WHOAMI'/g' ansible/site.yml
+sed -i -e 's/administrative/'$WHOAMI'/g' ansible/roles/keystone/tasks/main.yml
+sed -i -e 's/administrative/'$WHOAMI'/g' ansible/roles/heat/tasks/main.yml
 
 
 DEFAULT_GW_INT=eth0
@@ -66,8 +66,8 @@ echo "dafault route via:" $DEFAULT_GW_INT
 
 echo
 echo "Preparing Ansible templates based on current default gateway interface..."
-sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' roles/nova_aio/templates/nova.conf
-sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' roles/cinder/templates/cinder.conf
+sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' ansible/roles/nova_aio/templates/nova.conf
+sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' ansible/roles/cinder/templates/cinder.conf
 
 
 echo 

diff --git a/os-deploy.sh b/os-deploy.sh
@@ -189,36 +189,36 @@ echo "Configuring Bridge Mode to "$BR_MODE" on group_vars/all file..."
 # http://docs.openstack.org/networking-guide/scenario_legacy_lb.html
 if [ "$BR_MODE" = "LBR" ]
 then
-	sed -i -e 's/br_mode:.*/br_mode: "LBR"/' group_vars/all
-	sed -i -e 's/linuxnet_interface_driver:.*/linuxnet_interface_driver: "nova.network.linux_net.LinuxBridgeInterfaceDriver"/' group_vars/all
-	sed -i -e 's/neutron_interface_driver:.*/neutron_interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver"/' group_vars/all
-	sed -i -e 's/mechanism_drivers:.*/mechanism_drivers: "linuxbridge"/' group_vars/all
-	sed -i -e 's/firewall_driver:.*/firewall_driver: "neutron.agent.linux.iptables_firewall.IptablesFirewallDriver"/' group_vars/all
+	sed -i -e 's/br_mode:.*/br_mode: "LBR"/' ansible/group_vars/all
+	sed -i -e 's/linuxnet_interface_driver:.*/linuxnet_interface_driver: "nova.network.linux_net.LinuxBridgeInterfaceDriver"/' ansible/group_vars/all
+	sed -i -e 's/neutron_interface_driver:.*/neutron_interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver"/' ansible/group_vars/all
+	sed -i -e 's/mechanism_drivers:.*/mechanism_drivers: "linuxbridge"/' ansible/group_vars/all
+	sed -i -e 's/firewall_driver:.*/firewall_driver: "neutron.agent.linux.iptables_firewall.IptablesFirewallDriver"/' ansible/group_vars/all
 fi
 # http://docs.openstack.org/networking-guide/scenario_legacy_ovs.html
 if [ "$BR_MODE" = "OVS" ]
 then 
-         sed -i -e 's/br_mode:.*/br_mode: "OVS"/' group_vars/all
-         sed -i -e 's/linuxnet_interface_driver:.*/linuxnet_interface_driver: "nova.network.linux_net.LinuxOVSInterfaceDriver"/' group_vars/all
-         sed -i -e 's/neutron_interface_driver:.*/neutron_interface_driver: "neutron.agent.linux.interface.OVSInterfaceDriver"/' group_vars/all
-         sed -i -e 's/mechanism_drivers:.*/mechanism_drivers: "openvswitch"/' group_vars/all
-         sed -i -e 's/firewall_driver:.*/firewall_driver: "neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"/' group_vars/all
+         sed -i -e 's/br_mode:.*/br_mode: "OVS"/' ansible/group_vars/all
+         sed -i -e 's/linuxnet_interface_driver:.*/linuxnet_interface_driver: "nova.network.linux_net.LinuxOVSInterfaceDriver"/' ansible/group_vars/all
+         sed -i -e 's/neutron_interface_driver:.*/neutron_interface_driver: "neutron.agent.linux.interface.OVSInterfaceDriver"/' ansible/group_vars/all
+         sed -i -e 's/mechanism_drivers:.*/mechanism_drivers: "openvswitch"/' ansible/group_vars/all
+         sed -i -e 's/firewall_driver:.*/firewall_driver: "neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"/' ansible/group_vars/all
 fi
 
 
 # Configuring FQDN and Domain on group_vars/all
 echo
 echo "Configuring group_vars/all file based on current environment..."
-sed -i -e 's/controller-1.yourdomain.com/'$FQDN'/g' group_vars/all
-sed -i -e 's/yourdomain.com/'$DOMAIN'/g' group_vars/all
+sed -i -e 's/controller-1.yourdomain.com/'$FQDN'/g' ansible/group_vars/all
+sed -i -e 's/yourdomain.com/'$DOMAIN'/g' ansible/group_vars/all
 
 
 # Configuring site.yml and some roles
 echo
 echo "Configuring site.yml and OpenStack OpenRC files with your current $WHOAMI user..."
-sed -i -e 's/administrative/'$WHOAMI'/g' site.yml
-sed -i -e 's/administrative/'$WHOAMI'/g' roles/keystone/tasks/openrc-files.yml
-sed -i -e 's/administrative/'$WHOAMI'/g' roles/heat/tasks/main.yml
+sed -i -e 's/administrative/'$WHOAMI'/g' ansible/site.yml
+sed -i -e 's/administrative/'$WHOAMI'/g' ansible/roles/keystone/tasks/openrc-files.yml
+sed -i -e 's/administrative/'$WHOAMI'/g' ansible/roles/heat/tasks/main.yml
 
 
 # Configuring the default interface
@@ -230,8 +230,8 @@ echo "dafault route via:" $DEFAULT_GW_INT
 
 echo
 echo "Preparing Ansible templates based on current default gateway interface..."
-sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' roles/nova_aio/templates/nova.conf
-sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' roles/cinder/templates/cinder.conf
+sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' ansible/roles/nova_aio/templates/nova.conf
+sed -i -e 's/eth0/'$DEFAULT_GW_INT'/g' ansible/roles/cinder/templates/cinder.conf
 
 
 echo
@@ -243,7 +243,7 @@ then
         echo "Not running Ansible! Just preparing the environment variables..."
 else
         echo
-	cd ~/os-ansible-deployment-lite
+	cd ~/os-ansible-deployment-lite/ansible
         ansible-playbook site.yml
 fi