diff --git a/README.md b/README.md index eb95cb374a318fa7aa01d5e7397ce5a36835eee5..db575150d0f6ff5bbd0faea11e788acd4b426908 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,17 @@ -# openstack +# Openstack -Ivestigación acerca de enrutamiento en un DataCenter utilizando Openstack. \ No newline at end of file +Proyecto de grado dedicado a investigar la plataforma de datacenters Openstack. Particularmente documenta el proceso de diseño, instalación y configuración para poner en marcha la plataforma. Además pone énfasis en analizar en detalle el módulo de red Neutron. + +## Estructura del repositorio + +- **src/**: configuraciones de instalación y administración. + - **nodes/**: mantiene los archivos de configuración requeridos para de cada uno de los nodos, especialmente las configuraciones de red. + - **deploy/**: en el caso del nodo deploy se manejan subdirectorios en función de los distintos tipos de instalaciones que se realizaron. + - **manage/**: mantiene archivos de configuración y scripts que son útiles para administrar el datacenter. +- **docs/**: documentación. + - **escenarios/#/**: mantiene la descripción y análisis de cada escenario llevado a cabo durante el estudio del módulo de red. + - **imgs/**: diagrama del escenario, capturas gráficas de paquetes, etc. + - **pcaps/**: pcaps del escenario. + - **imgs/**: imágenes generales, p.e. diagrama de arquitectura. + - **latex/**: código fuente latex de la documentación. +- **taller/**: archivos de configuración y documentación del trabajo de instalación realizado para el módulo taller. diff --git a/docs/PropuestaInstanciaModuloTaller_OpenStack.odt b/docs/PropuestaInstanciaModuloTaller_OpenStack.odt deleted file mode 100644 index cbd58630f06081924ef6911ddfd00a179bfd2ae1..0000000000000000000000000000000000000000 Binary files a/docs/PropuestaInstanciaModuloTaller_OpenStack.odt and /dev/null differ diff --git a/docs/escenarios/1/README.md b/docs/escenarios/1/README.md new file mode 100644 index 0000000000000000000000000000000000000000..fd98b6381f5d42cc6439623e7c49dc61210ffa7e --- /dev/null +++ b/docs/escenarios/1/README.md @@ -0,0 +1,3 @@ +# Tráfico este-oeste (misma red tenant) + +Ejemplifica la comunicación de red entre dos instancias asociadas a la misma red tenant de tipo VXLAN alojadas en diferentes nodos de cómputo. Esto permite apreciar cómo Neutron resuelve el pasaje de la red virtual a la red física subyacente. diff --git a/docs/Capturas e imagenes/Escenario 1/Diagrama-Escenario 1.png b/docs/escenarios/1/imgs/Diagrama-Escenario 1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/Diagrama-Escenario 1.png rename to docs/escenarios/1/imgs/Diagrama-Escenario 1.png diff --git a/docs/Capturas e imagenes/Escenario 1/paq-arp-br-vxlan.png b/docs/escenarios/1/imgs/paq-arp-br-vxlan.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/paq-arp-br-vxlan.png rename to docs/escenarios/1/imgs/paq-arp-br-vxlan.png diff --git a/docs/Capturas e imagenes/Escenario 1/paq-arp-eth0-inst1.png b/docs/escenarios/1/imgs/paq-arp-eth0-inst1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/paq-arp-eth0-inst1.png rename to docs/escenarios/1/imgs/paq-arp-eth0-inst1.png diff --git a/docs/Capturas e imagenes/Escenario 1/paq-arp-reply-br-vxlan.png b/docs/escenarios/1/imgs/paq-arp-reply-br-vxlan.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/paq-arp-reply-br-vxlan.png rename to docs/escenarios/1/imgs/paq-arp-reply-br-vxlan.png diff --git a/docs/Capturas e imagenes/Escenario 1/paq-arp-reply-inst1.png b/docs/escenarios/1/imgs/paq-arp-reply-inst1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/paq-arp-reply-inst1.png rename to docs/escenarios/1/imgs/paq-arp-reply-inst1.png diff --git a/docs/Capturas e imagenes/Escenario 1/paq-icmp-br-vxlan.png b/docs/escenarios/1/imgs/paq-icmp-br-vxlan.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/paq-icmp-br-vxlan.png rename to docs/escenarios/1/imgs/paq-icmp-br-vxlan.png diff --git a/docs/Capturas e imagenes/Escenario 1/paq-icmp-inst1.png b/docs/escenarios/1/imgs/paq-icmp-inst1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/paq-icmp-inst1.png rename to docs/escenarios/1/imgs/paq-icmp-inst1.png diff --git a/docs/Capturas e imagenes/Escenario 1/tap-instance1-escenario1.pcap b/docs/escenarios/1/pcaps/tap-instance1-escenario1.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/tap-instance1-escenario1.pcap rename to docs/escenarios/1/pcaps/tap-instance1-escenario1.pcap diff --git a/docs/Capturas e imagenes/Escenario 1/vxlan-escenario1.pcap b/docs/escenarios/1/pcaps/vxlan-escenario1.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 1/vxlan-escenario1.pcap rename to docs/escenarios/1/pcaps/vxlan-escenario1.pcap diff --git a/docs/escenarios/2/README.md b/docs/escenarios/2/README.md new file mode 100644 index 0000000000000000000000000000000000000000..48c13d704ebb3a244808974e4dcea9de09eb53fa --- /dev/null +++ b/docs/escenarios/2/README.md @@ -0,0 +1,4 @@ +# Tráfico este-oeste (distintas redes tenant) + +Ejemplifica la comunicación de red entre dos instancias asociadas a distintas redes tenant de tipo VXLAN. Este escenario permite analizar cómo Neutron resuelve el routing mediante el módulo L3 entre redes internas del datacenter. A diferencia del primer ambiente, el nodo de red albergará varios componentes para la comunicación. + diff --git a/docs/Capturas e imagenes/Escenario 2/Diagrama-Escenario 2.png b/docs/escenarios/2/imgs/Diagrama-Escenario 2.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 2/Diagrama-Escenario 2.png rename to docs/escenarios/2/imgs/Diagrama-Escenario 2.png diff --git a/docs/Capturas e imagenes/Escenario 2/paq-icmp-br-vxlan-comp1.png b/docs/escenarios/2/imgs/paq-icmp-br-vxlan-comp1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 2/paq-icmp-br-vxlan-comp1.png rename to docs/escenarios/2/imgs/paq-icmp-br-vxlan-comp1.png diff --git a/docs/Capturas e imagenes/Escenario 2/paq-icmp-br-vxlan-comp2.png b/docs/escenarios/2/imgs/paq-icmp-br-vxlan-comp2.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 2/paq-icmp-br-vxlan-comp2.png rename to docs/escenarios/2/imgs/paq-icmp-br-vxlan-comp2.png diff --git a/docs/Capturas e imagenes/Escenario 2/vxlan-escenario2-compute1.pcap b/docs/escenarios/2/pcaps/vxlan-escenario2-compute1.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 2/vxlan-escenario2-compute1.pcap rename to docs/escenarios/2/pcaps/vxlan-escenario2-compute1.pcap diff --git a/docs/Capturas e imagenes/Escenario 2/vxlan-escenario2-compute2.pcap b/docs/escenarios/2/pcaps/vxlan-escenario2-compute2.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 2/vxlan-escenario2-compute2.pcap rename to docs/escenarios/2/pcaps/vxlan-escenario2-compute2.pcap diff --git a/docs/escenarios/3/README.md b/docs/escenarios/3/README.md new file mode 100644 index 0000000000000000000000000000000000000000..9c2bb51e6b3b7929435497962f88f6b18b938342 --- /dev/null +++ b/docs/escenarios/3/README.md @@ -0,0 +1,3 @@ +# tráfico norte-sur (acceso hacia el exterior) + +Ejemplifica la comunicación de una instancia asociada a una red tenant de tipo VXLAN, con un host externo a Openstack a través de una red provider de tipo VLAN. Este escenario permite analizar cómo Neutron resuelve el routing mediante el módulo L3 entre una red interna del datacenter y una red externa. diff --git a/docs/Capturas e imagenes/Escenario 3/Diagrama-Escenario 3.png b/docs/escenarios/3/imgs/Diagrama-Escenario 3.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 3/Diagrama-Escenario 3.png rename to docs/escenarios/3/imgs/Diagrama-Escenario 3.png diff --git a/docs/Capturas e imagenes/Escenario 3/arp-req-br-vlan.png b/docs/escenarios/3/imgs/arp-req-br-vlan.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 3/arp-req-br-vlan.png rename to docs/escenarios/3/imgs/arp-req-br-vlan.png diff --git a/docs/Capturas e imagenes/Escenario 3/paq-icmp-br-vlan.png b/docs/escenarios/3/imgs/paq-icmp-br-vlan.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 3/paq-icmp-br-vlan.png rename to docs/escenarios/3/imgs/paq-icmp-br-vlan.png diff --git a/docs/Capturas e imagenes/Escenario 3/paq-icmp-br-vxlan-comp1.png b/docs/escenarios/3/imgs/paq-icmp-br-vxlan-comp1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 3/paq-icmp-br-vxlan-comp1.png rename to docs/escenarios/3/imgs/paq-icmp-br-vxlan-comp1.png diff --git a/docs/Capturas e imagenes/Escenario 3/vlan-100-escenario3-infra1.pcap b/docs/escenarios/3/pcaps/vlan-100-escenario3-infra1.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 3/vlan-100-escenario3-infra1.pcap rename to docs/escenarios/3/pcaps/vlan-100-escenario3-infra1.pcap diff --git a/docs/Capturas e imagenes/Escenario 3/vlan-escenario3-infra1.pcap b/docs/escenarios/3/pcaps/vlan-escenario3-infra1.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 3/vlan-escenario3-infra1.pcap rename to docs/escenarios/3/pcaps/vlan-escenario3-infra1.pcap diff --git a/docs/Capturas e imagenes/Escenario 3/vxlan-escenario3-compute1.pcap b/docs/escenarios/3/pcaps/vxlan-escenario3-compute1.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 3/vxlan-escenario3-compute1.pcap rename to docs/escenarios/3/pcaps/vxlan-escenario3-compute1.pcap diff --git a/docs/escenarios/4/README.md b/docs/escenarios/4/README.md new file mode 100644 index 0000000000000000000000000000000000000000..d8d8b3479905a3e607eaefcb4f679e0cf4b9284c --- /dev/null +++ b/docs/escenarios/4/README.md @@ -0,0 +1,3 @@ +# tráfico norte-sur (acceso desde el exterior) + +Ejemplifica la comunicación hacia una instancia asociada a una red tenant de tipo VXLAN, desde un host externo a Openstack a través de una red provider de tipo VLAN. Este escenario permite analizar cómo Neutron resuelve el routing mediante el módulo L3 desde una red externa al datacenter hacia una red interna. diff --git a/docs/Capturas e imagenes/Escenario 4/Diagrama-Escenario 4.png b/docs/escenarios/4/imgs/Diagrama-Escenario 4.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/Diagrama-Escenario 4.png rename to docs/escenarios/4/imgs/Diagrama-Escenario 4.png diff --git a/docs/Capturas e imagenes/Escenario 4/paq-icmp-eth3-100-router.png b/docs/escenarios/4/imgs/paq-icmp-eth3-100-router.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/paq-icmp-eth3-100-router.png rename to docs/escenarios/4/imgs/paq-icmp-eth3-100-router.png diff --git a/docs/Capturas e imagenes/Escenario 4/paq-icmp-eth3-router.png b/docs/escenarios/4/imgs/paq-icmp-eth3-router.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/paq-icmp-eth3-router.png rename to docs/escenarios/4/imgs/paq-icmp-eth3-router.png diff --git a/docs/Capturas e imagenes/Escenario 4/paq-icmp-qg-infra1.png b/docs/escenarios/4/imgs/paq-icmp-qg-infra1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/paq-icmp-qg-infra1.png rename to docs/escenarios/4/imgs/paq-icmp-qg-infra1.png diff --git a/docs/Capturas e imagenes/Escenario 4/paq-icmp-qr-infra1.png b/docs/escenarios/4/imgs/paq-icmp-qr-infra1.png similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/paq-icmp-qr-infra1.png rename to docs/escenarios/4/imgs/paq-icmp-qr-infra1.png diff --git a/docs/Capturas e imagenes/Escenario 4/eth3-escenario4-router.pcap b/docs/escenarios/4/pcaps/eth3-escenario4-router.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/eth3-escenario4-router.pcap rename to docs/escenarios/4/pcaps/eth3-escenario4-router.pcap diff --git a/docs/Capturas e imagenes/Escenario 4/qg-escenario4.pcap b/docs/escenarios/4/pcaps/qg-escenario4.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/qg-escenario4.pcap rename to docs/escenarios/4/pcaps/qg-escenario4.pcap diff --git a/docs/Capturas e imagenes/Escenario 4/qr-escenario4.pcap b/docs/escenarios/4/pcaps/qr-escenario4.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/qr-escenario4.pcap rename to docs/escenarios/4/pcaps/qr-escenario4.pcap diff --git a/docs/Capturas e imagenes/Escenario 4/vlan-escenario4-router.pcap b/docs/escenarios/4/pcaps/vlan-escenario4-router.pcap similarity index 100% rename from docs/Capturas e imagenes/Escenario 4/vlan-escenario4-router.pcap rename to docs/escenarios/4/pcaps/vlan-escenario4-router.pcap diff --git a/docs/Capturas e imagenes/Generales/Diagrama-Arquitectura.png b/docs/imgs/Diagrama-Arquitectura.png similarity index 100% rename from docs/Capturas e imagenes/Generales/Diagrama-Arquitectura.png rename to docs/imgs/Diagrama-Arquitectura.png diff --git a/references/Container-Networking-Docker-Kubernetes.pdf b/references/Container-Networking-Docker-Kubernetes.pdf deleted file mode 100644 index 0af4bfc1c86c781f2a3045531d58f7ef1dcfd2f7..0000000000000000000000000000000000000000 Binary files a/references/Container-Networking-Docker-Kubernetes.pdf and /dev/null differ diff --git a/references/Identity, Authentication, and Access Management in OpenStack - Steve Martinelli.pdf b/references/Identity, Authentication, and Access Management in OpenStack - Steve Martinelli.pdf deleted file mode 100644 index 713d87507cab28fea883b02ac1b504511f1f936b..0000000000000000000000000000000000000000 Binary files a/references/Identity, Authentication, and Access Management in OpenStack - Steve Martinelli.pdf and /dev/null differ diff --git a/references/Identity, Authentication, and Access Management in OpenStack.pdf b/references/Identity, Authentication, and Access Management in OpenStack.pdf deleted file mode 100644 index 713d87507cab28fea883b02ac1b504511f1f936b..0000000000000000000000000000000000000000 Binary files a/references/Identity, Authentication, and Access Management in OpenStack.pdf and /dev/null differ diff --git a/references/Learning OpenStack Networking.pdf b/references/Learning OpenStack Networking.pdf deleted file mode 100644 index 5ae53af47b7545da5c5a437b28b91b842f6e18b5..0000000000000000000000000000000000000000 Binary files a/references/Learning OpenStack Networking.pdf and /dev/null differ diff --git a/references/Libro Cookbook.pdf b/references/Libro Cookbook.pdf deleted file mode 100644 index 7c6d8477f536b4c4164d8b86d05610052a7b5bc2..0000000000000000000000000000000000000000 Binary files a/references/Libro Cookbook.pdf and /dev/null differ diff --git a/references/Openstack for Architects I.pdf b/references/Openstack for Architects I.pdf deleted file mode 100644 index 04641f643a78a63f8d1f928be53ef57df5ddc9db..0000000000000000000000000000000000000000 Binary files a/references/Openstack for Architects I.pdf and /dev/null differ diff --git a/references/Openstack for Architects.pdf b/references/Openstack for Architects.pdf deleted file mode 100644 index 77199cb4a48b0904823bb19d140cd3f6295cb986..0000000000000000000000000000000000000000 Binary files a/references/Openstack for Architects.pdf and /dev/null differ diff --git a/references/bgp-in-the-data-center.pdf b/references/bgp-in-the-data-center.pdf deleted file mode 100644 index 90c6a839f35b9213d3e3e9c2de647d9cacb81eb8..0000000000000000000000000000000000000000 Binary files a/references/bgp-in-the-data-center.pdf and /dev/null differ diff --git a/manage/scripts/migrate_instance.sh b/src/manage/scripts/migrate_instance.sh similarity index 100% rename from manage/scripts/migrate_instance.sh rename to src/manage/scripts/migrate_instance.sh diff --git a/src/compute1/network-scripts/ifcfg-br-mgmt b/src/nodes/compute/network-scripts/ifcfg-br-mgmt similarity index 100% rename from src/compute1/network-scripts/ifcfg-br-mgmt rename to src/nodes/compute/network-scripts/ifcfg-br-mgmt diff --git a/src/compute1/network-scripts/ifcfg-br-storage b/src/nodes/compute/network-scripts/ifcfg-br-storage similarity index 100% rename from src/compute1/network-scripts/ifcfg-br-storage rename to src/nodes/compute/network-scripts/ifcfg-br-storage diff --git a/src/compute1/network-scripts/ifcfg-br-vxlan b/src/nodes/compute/network-scripts/ifcfg-br-vxlan similarity index 100% rename from src/compute1/network-scripts/ifcfg-br-vxlan rename to src/nodes/compute/network-scripts/ifcfg-br-vxlan diff --git a/src/compute1/network-scripts/ifcfg-eth0 b/src/nodes/compute/network-scripts/ifcfg-eth0 similarity index 100% rename from src/compute1/network-scripts/ifcfg-eth0 rename to src/nodes/compute/network-scripts/ifcfg-eth0 diff --git a/src/compute1/network-scripts/ifcfg-eth1 b/src/nodes/compute/network-scripts/ifcfg-eth1 similarity index 100% rename from src/compute1/network-scripts/ifcfg-eth1 rename to src/nodes/compute/network-scripts/ifcfg-eth1 diff --git a/src/compute1/network-scripts/ifcfg-eth2 b/src/nodes/compute/network-scripts/ifcfg-eth2 similarity index 100% rename from src/compute1/network-scripts/ifcfg-eth2 rename to src/nodes/compute/network-scripts/ifcfg-eth2 diff --git a/src/compute1/network-scripts/ifcfg-eth3 b/src/nodes/compute/network-scripts/ifcfg-eth3 similarity index 100% rename from src/compute1/network-scripts/ifcfg-eth3 rename to src/nodes/compute/network-scripts/ifcfg-eth3 diff --git a/docs/conf_router b/src/nodes/conf_router similarity index 100% rename from docs/conf_router rename to src/nodes/conf_router diff --git a/docs/installation b/src/nodes/configuraciones similarity index 100% rename from docs/installation rename to src/nodes/configuraciones diff --git a/src/deploy/ceph/cinder-volume.yml b/src/nodes/deploy/ceph/cinder-volume.yml similarity index 100% rename from src/deploy/ceph/cinder-volume.yml rename to src/nodes/deploy/ceph/cinder-volume.yml diff --git a/src/deploy/ceph/opestack_user_config_prod.yml b/src/nodes/deploy/ceph/opestack_user_config_prod.yml similarity index 100% rename from src/deploy/ceph/opestack_user_config_prod.yml rename to src/nodes/deploy/ceph/opestack_user_config_prod.yml diff --git a/src/deploy/ceph/user_variables.yml b/src/nodes/deploy/ceph/user_variables.yml similarity index 100% rename from src/deploy/ceph/user_variables.yml rename to src/nodes/deploy/ceph/user_variables.yml diff --git a/src/deploy/lvm/cinder-volume.yml b/src/nodes/deploy/lvm/cinder-volume.yml similarity index 100% rename from src/deploy/lvm/cinder-volume.yml rename to src/nodes/deploy/lvm/cinder-volume.yml diff --git a/src/deploy/lvm/openstack_user_config_test.yml b/src/nodes/deploy/lvm/openstack_user_config_test.yml similarity index 100% rename from src/deploy/lvm/openstack_user_config_test.yml rename to src/nodes/deploy/lvm/openstack_user_config_test.yml diff --git a/src/deploy/lvm/opestack_user_config_prod.yml b/src/nodes/deploy/lvm/opestack_user_config_prod.yml similarity index 100% rename from src/deploy/lvm/opestack_user_config_prod.yml rename to src/nodes/deploy/lvm/opestack_user_config_prod.yml diff --git a/src/deploy/lvm/user_variables.yml b/src/nodes/deploy/lvm/user_variables.yml similarity index 100% rename from src/deploy/lvm/user_variables.yml rename to src/nodes/deploy/lvm/user_variables.yml diff --git a/src/deploy/network-scripts/ifcfg-eth0 b/src/nodes/deploy/network-scripts/ifcfg-eth0 similarity index 100% rename from src/deploy/network-scripts/ifcfg-eth0 rename to src/nodes/deploy/network-scripts/ifcfg-eth0 diff --git a/src/haproxy1/network-scripts/ifcfg-eth0 b/src/nodes/haproxy/network-scripts/ifcfg-eth0 similarity index 100% rename from src/haproxy1/network-scripts/ifcfg-eth0 rename to src/nodes/haproxy/network-scripts/ifcfg-eth0 diff --git a/src/haproxy1/network-scripts/ifcfg-eth1 b/src/nodes/haproxy/network-scripts/ifcfg-eth1 similarity index 100% rename from src/haproxy1/network-scripts/ifcfg-eth1 rename to src/nodes/haproxy/network-scripts/ifcfg-eth1 diff --git a/src/infra1/network-scripts/ifcfg-br-mgmt b/src/nodes/infra/network-scripts/ifcfg-br-mgmt similarity index 100% rename from src/infra1/network-scripts/ifcfg-br-mgmt rename to src/nodes/infra/network-scripts/ifcfg-br-mgmt diff --git a/src/infra1/network-scripts/ifcfg-br-storage b/src/nodes/infra/network-scripts/ifcfg-br-storage similarity index 100% rename from src/infra1/network-scripts/ifcfg-br-storage rename to src/nodes/infra/network-scripts/ifcfg-br-storage diff --git a/src/infra1/network-scripts/ifcfg-br-vxlan b/src/nodes/infra/network-scripts/ifcfg-br-vxlan similarity index 100% rename from src/infra1/network-scripts/ifcfg-br-vxlan rename to src/nodes/infra/network-scripts/ifcfg-br-vxlan diff --git a/src/infra1/network-scripts/ifcfg-eth0 b/src/nodes/infra/network-scripts/ifcfg-eth0 similarity index 100% rename from src/infra1/network-scripts/ifcfg-eth0 rename to src/nodes/infra/network-scripts/ifcfg-eth0 diff --git a/src/infra1/network-scripts/ifcfg-eth1 b/src/nodes/infra/network-scripts/ifcfg-eth1 similarity index 100% rename from src/infra1/network-scripts/ifcfg-eth1 rename to src/nodes/infra/network-scripts/ifcfg-eth1 diff --git a/src/infra1/network-scripts/ifcfg-eth2 b/src/nodes/infra/network-scripts/ifcfg-eth2 similarity index 100% rename from src/infra1/network-scripts/ifcfg-eth2 rename to src/nodes/infra/network-scripts/ifcfg-eth2 diff --git a/src/infra1/network-scripts/ifcfg-eth3 b/src/nodes/infra/network-scripts/ifcfg-eth3 similarity index 100% rename from src/infra1/network-scripts/ifcfg-eth3 rename to src/nodes/infra/network-scripts/ifcfg-eth3 diff --git a/src/router/network-scripts/ifcfg-eth0 b/src/nodes/router/network-scripts/ifcfg-eth0 similarity index 100% rename from src/router/network-scripts/ifcfg-eth0 rename to src/nodes/router/network-scripts/ifcfg-eth0 diff --git a/src/router/network-scripts/ifcfg-eth1 b/src/nodes/router/network-scripts/ifcfg-eth1 similarity index 100% rename from src/router/network-scripts/ifcfg-eth1 rename to src/nodes/router/network-scripts/ifcfg-eth1 diff --git a/src/router/network-scripts/ifcfg-eth2 b/src/nodes/router/network-scripts/ifcfg-eth2 similarity index 100% rename from src/router/network-scripts/ifcfg-eth2 rename to src/nodes/router/network-scripts/ifcfg-eth2 diff --git a/src/router/network-scripts/ifcfg-eth3 b/src/nodes/router/network-scripts/ifcfg-eth3 similarity index 100% rename from src/router/network-scripts/ifcfg-eth3 rename to src/nodes/router/network-scripts/ifcfg-eth3 diff --git a/src/router/network-scripts/ifcfg-eth3.100 b/src/nodes/router/network-scripts/ifcfg-eth3.100 similarity index 100% rename from src/router/network-scripts/ifcfg-eth3.100 rename to src/nodes/router/network-scripts/ifcfg-eth3.100 diff --git a/src/router/network-scripts/ifcfg-eth3.101 b/src/nodes/router/network-scripts/ifcfg-eth3.101 similarity index 100% rename from src/router/network-scripts/ifcfg-eth3.101 rename to src/nodes/router/network-scripts/ifcfg-eth3.101 diff --git a/src/router/network-scripts/ifcfg-eth3.bk b/src/nodes/router/network-scripts/ifcfg-eth3.bk similarity index 100% rename from src/router/network-scripts/ifcfg-eth3.bk rename to src/nodes/router/network-scripts/ifcfg-eth3.bk diff --git a/src/storage1/network-scripts/ifcfg-br-mgmt b/src/nodes/storage/network-scripts/ifcfg-br-mgmt similarity index 100% rename from src/storage1/network-scripts/ifcfg-br-mgmt rename to src/nodes/storage/network-scripts/ifcfg-br-mgmt diff --git a/src/storage1/network-scripts/ifcfg-br-storage b/src/nodes/storage/network-scripts/ifcfg-br-storage similarity index 100% rename from src/storage1/network-scripts/ifcfg-br-storage rename to src/nodes/storage/network-scripts/ifcfg-br-storage diff --git a/src/storage1/network-scripts/ifcfg-eth0 b/src/nodes/storage/network-scripts/ifcfg-eth0 similarity index 100% rename from src/storage1/network-scripts/ifcfg-eth0 rename to src/nodes/storage/network-scripts/ifcfg-eth0 diff --git a/src/storage1/network-scripts/ifcfg-eth1 b/src/nodes/storage/network-scripts/ifcfg-eth1 similarity index 100% rename from src/storage1/network-scripts/ifcfg-eth1 rename to src/nodes/storage/network-scripts/ifcfg-eth1 diff --git a/src/renata/sshd_config b/src/renata/sshd_config deleted file mode 100644 index 215a63e862b05d60daa754361fc51d1ad0b6d251..0000000000000000000000000000000000000000 --- a/src/renata/sshd_config +++ /dev/null @@ -1,145 +0,0 @@ -# $OpenBSD: sshd_config,v 1.100 2016/08/15 12:32:04 naddy Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/local/bin:/usr/bin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -# If you want to change the port on a SELinux system, you have to tell -# SELinux about this change. -# semanage port -a -t ssh_port_t -p tcp #PORTNUMBER -# -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_dsa_key -HostKey /etc/ssh/ssh_host_ecdsa_key -HostKey /etc/ssh/ssh_host_ed25519_key - -# Ciphers and keying -#RekeyLimit default none - -# Logging -#SyslogFacility AUTH -SyslogFacility AUTHPRIV -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -PermitRootLogin no -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys - -#AuthorizedPrincipalsFile none - -#AuthorizedKeysCommand none -#AuthorizedKeysCommandUser nobody - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no -PasswordAuthentication yes - -# Change to no to disable s/key passwords -#ChallengeResponseAuthentication yes -ChallengeResponseAuthentication no - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no -#KerberosUseKuserok yes - -# GSSAPI options -GSSAPIAuthentication yes -GSSAPICleanupCredentials no -#GSSAPIStrictAcceptorCheck yes -#GSSAPIKeyExchange no -#GSSAPIEnablek5users no - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -# WARNING: 'UsePAM no' is not supported in Red Hat Enterprise Linux and may cause several -# problems. -UsePAM yes - -#AllowAgentForwarding yes -AllowAgentForwarding yes -#AllowTcpForwarding yes -AllowTcpForwarding yes -#GatewayPorts no -GatewayPorts yes -X11Forwarding yes -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PermitTTY yes -#PrintMotd yes -#PrintLastLog yes -#TCPKeepAlive yes -TCPKeepAlive yes -#UseLogin no -#UsePrivilegeSeparation sandbox -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#ShowPatchLevel no -#UseDNS yes -#PidFile /var/run/sshd.pid -#MaxStartups 10:30:100 -#PermitTunnel no -PermitTunnel yes -#ChrootDirectory none -#VersionAddendum none - -# no default banner path -#Banner none - -# Accept locale-related environment variables -AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES -AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT -AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE -AcceptEnv XMODIFIERS - -# override default of no subsystems -Subsystem sftp /usr/libexec/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# PermitTTY no -# ForceCommand cvs server - diff --git a/taller/src/deploy/setupDeploy.sh b/taller/src/deploy/setupDeploy.sh deleted file mode 100644 index ba124dd8167c136a518f92f58ba17a2f628b490b..0000000000000000000000000000000000000000 --- a/taller/src/deploy/setupDeploy.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -echo "CONFIGURANDO PROXY ..." -sleep 1 -echo "http_proxy=http://10.0.1.1:3128" >> /etc/environment -echo "https_proxy=http://10.0.1.1:3128" >> /etc/environment -echo "HTTP_PROXY=http://10.0.1.1:3128" >> /etc/environment -echo "HTTPS_PROXY=http://10.0.1.1:3128" >> /etc/environment -for env in $( cat /etc/environment ); do export $(echo $env | sed -e 's/"//g'); done - -echo "ACTUALIZANDO CentOS 7..." -yum upgrade -y - -echo "INSTALANDO RDO OSA QUEENS..." -yum install -y https://rdoproject.org/repos/openstack-queens/rdo-release-queens.rpm - -echo "INSTALANDO HERRAMIENTAS..." -yum install -y git ntp nano net-tools ntpdate openssh-server python-devel sudo '@Development Tools' - -echo "DESHABILITANDO FIREWALL" -sleep 1 -systemctl stop firewalld -systemctl mask firewalld - -echo "CONFIGURAR CHRONY MANUALMENTE!!!" -sleep 1 -# nano /etc/chrony.conf -# Sustituir por las líneas -# server 0.south-america.pool.ntp.org -# server 1.south-america.pool.ntp.org -# server 2.south-america.pool.ntp.org -# server 3.south-america.pool.ntp.org - -echo "CLANANDO REPOSITORIO GIT..." -git clone -b 17.1.4 https://git.openstack.org/openstack/openstack-ansible /opt/openstack-ansible - -echo "EJECUTANDO BOOTSTRAP-ANSIBLE..." -/opt/openstack-ansible/scripts/bootstrap-ansible.sh - -echo "GENERANDO CLAVES SSH..." -ssh-keygen - -echo "COPIAR MANUALMENTE CLAVES SSH..." -#ssh-copy-id root@10.0.1.11