Skip to content
Snippets Groups Projects
Commit 3250aeb0 authored by MUNIER Florian's avatar MUNIER Florian
Browse files

[udp] clean code

parent 4c7223a9
No related branches found
No related tags found
No related merge requests found
Pipeline #15306 failed
module "mod-os-private-network" {
source = "./mod-os-private-network/"
PROJECT_TERRAFORM_PATH = "$HOME/projet_terraform"
KEYPAIR_PATH = "$HOME/.ssh"
EXTERNAL_NETWORK = "external"
ROUTER_NAME = "router"
......
......@@ -2,8 +2,8 @@
resource "null_resource" "ansible" {
provisioner "local-exec" {
interpreter = ["/bin/bash", "-c"]
#command = "source /home/user/TP/Ansible/venv/ansible/bin/activate; ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -u root -i ${var.PROJECT_TERRAFORM_PATH}/mod-ansible/hosts.ini --private-key ${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pem -e pub_key=${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pub ${var.PROJECT_TERRAFORM_PATH}/mod-ansible/apache-install.yml; deactivate"
command = "source /home/user/TP/Ansible/venv/ansible/bin/activate; ANSIBLE_HOST_KEY_CHECKING=False ansible -i hosts.ini all -m ping --private-key .ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pem -e pub_key=.ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pub; deactivate"
#command = "source /home/user/TP/Ansible/venv/ansible/bin/activate; ANSIBLE_HOST_KEY_CHECKING=False ansible -i hosts.ini all -m ping --private-key .ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pem -e pub_key=.ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pub; deactivate"
command = "ANSIBLE_HOST_KEY_CHECKING=False ansible -i hosts.ini all -m ping --private-key .ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pem -e pub_key=.ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pub"
}
depends_on = [
openstack_compute_instance_v2.bastion_instance,
......
......@@ -5,7 +5,6 @@ resource "openstack_networking_floatingip_v2" "floatip_admin" {
# Copie IP publique dans un fichier .txt sur la machine hébergeante
provisioner "local-exec" {
#command = "cd ${var.PROJECT_TERRAFORM_PATH}; mkdir ip_files; echo '${var.INSTANCE_BASTION_NAME} : ${self.address}' > ${var.PROJECT_TERRAFORM_PATH}/ip_files/public_ips.txt"
command = "mkdir ip_files; echo '${var.INSTANCE_BASTION_NAME} : ${self.address}' > ip_files/public_ips.txt"
}
......@@ -26,7 +25,6 @@ resource "openstack_networking_floatingip_v2" "floatip_application" {
# Copie IP publique dans un fichier .txt sur la machine hébergeante
provisioner "local-exec" {
#command = "echo '${var.INSTANCE_ORCHEST_NAME[0]} : ${self.address}' >> ${var.PROJECT_TERRAFORM_PATH}/ip_files/public_ips.txt"
command = "echo '${var.INSTANCE_ORCHEST_NAME[0]} : ${self.address}' >> ip_files/public_ips.txt"
}
......
......@@ -14,8 +14,6 @@ resource "openstack_compute_instance_v2" "bastion_instance" {
# Copie des IP locales dans un fichier .txt sur la machine hébergeante
# Inventaire Ansible
provisioner "local-exec" {
#command = "echo '${self.name} : ${self.access_ip_v4}' > ${var.PROJECT_TERRAFORM_PATH}/ip_files/private_ips.txt; echo '[app]' > ${var.PROJECT_TERRAFORM_PATH}/mod-ansible/hosts.ini; echo ${self.name} ansible_host=${openstack_networking_floatingip_v2.floatip_admin.address} ansible_user=ubuntu ansible_ssh_private_key_file='${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pem' >> ${var.PROJECT_TERRAFORM_PATH}/mod-ansible/hosts.ini"
#command = "echo '${self.name} : ${self.access_ip_v4}' > ip_files/private_ips.txt; echo '[app]' > hosts.ini; echo ${self.name} ansible_host=${openstack_networking_floatingip_v2.floatip_admin.address} ansible_user=ubuntu ansible_ssh_private_key_file='${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pem' >> hosts.ini"
command = "echo '${self.name} : ${self.access_ip_v4}' > ip_files/private_ips.txt; echo '[app]' > hosts.ini; echo ${self.name} ansible_host=${openstack_networking_floatingip_v2.floatip_admin.address} ansible_user=ubuntu ansible_ssh_private_key_file='.ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pem' >> hosts.ini"
}
......@@ -42,7 +40,6 @@ resource "openstack_compute_instance_v2" "orchestration_instance" {
# Copie des IP locales dans un fichier .txt sur la machine hébergeante
# Inventaire Ansible
provisioner "local-exec" {
#command = "echo '${self.name} : ${self.access_ip_v4}' >> ${var.PROJECT_TERRAFORM_PATH}/ip_files/private_ips.txt; echo ${self.name} ansible_host=${self.access_ip_v4} ansible_user=ubuntu ansible_ssh_private_key_file='${var.INSTANCE_ORCHEST_KEY_PAIR}.pem'>> ${var.PROJECT_TERRAFORM_PATH}/mod-ansible/hosts.ini"
command = "echo '${self.name} : ${self.access_ip_v4}' >> ip_files/private_ips.txt; echo ${self.name} ansible_host=${self.access_ip_v4} ansible_user=ubuntu ansible_ssh_private_key_file='${var.INSTANCE_ORCHEST_KEY_PAIR}.pem'>> hosts.ini"
}
......
......@@ -4,7 +4,6 @@ resource "openstack_compute_keypair_v2" "keypair_project" {
# Copie de la paire de clés sur la machine hébergeante
provisioner "local-exec" {
#command = "cd $HOME; mkdir .ssh; echo '${self.private_key}' > ${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pem; echo '${self.public_key}' > ${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pub; chmod 600 ${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pem; chmod 600 ${var.KEYPAIR_PATH}/${var.INSTANCE_BASTION_KEY_PAIR}.pub"
command = "mkdir .ssh; echo '${self.private_key}' > .ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pem; echo '${self.public_key}' > .ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pub; chmod 600 .ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pem; chmod 600 .ssh/${var.INSTANCE_BASTION_KEY_PAIR}.pub"
}
}
......
......@@ -83,11 +83,6 @@ variable "SECGROUP_INTERNAL_NETWORK_NAME" {
default = "secgroup_internal_network"
}
variable "PROJECT_TERRAFORM_PATH" {
type = string
default = "$HOME/projet_terraform"
}
variable "KEYPAIR_PATH" {
type = string
default = "$HOME/.ssh"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment