From a0bee77b2f401bb537021d7e59ccad2a9314ae0a Mon Sep 17 00:00:00 2001 From: Umesh Singla Date: Tue, 13 Dec 2016 22:01:01 +0530 Subject: [PATCH] Fix json files Clean up json indentation warnings generated by coala Change-Id: Iaa806d2fb7d8662c1ad089953f9e4208036b40fa Signed-off-by: Umesh Singla --- packer/templates/docker.json | 85 +++++++++--------- packer/templates/libvirt.json | 101 +++++++++++---------- packer/templates/virtualbox.json | 135 ++++++++++++++-------------- packer/vars/centos-7.2.1511.json | 10 +-- packer/vars/fedora-24.json | 10 +-- packer/vars/opendaylight-3.4.0.json | 8 +- packer/vars/opendaylight-4.0.0.json | 8 +- packer/vars/opendaylight-4.1.0.json | 8 +- packer/vars/opendaylight-4.2.0.json | 8 +- packer/vars/opendaylight-4.3.0.json | 8 +- packer/vars/opendaylight-4.4.0.json | 8 +- packer/vars/opendaylight-5.0.0.json | 8 +- 12 files changed, 197 insertions(+), 200 deletions(-) diff --git a/packer/templates/docker.json b/packer/templates/docker.json index 257cc8d..7e861d5 100644 --- a/packer/templates/docker.json +++ b/packer/templates/docker.json @@ -1,46 +1,45 @@ { - "variables": { - "odl_version": null, - "os_name": null, - "os_version": null, - "docker_repo": null, - "rpm_repo_file": null, - "rpm_repo_url": null - }, - "builders": [ - { - "type": "docker", - "image": "{{ user `os_name` }}:{{ user `os_version` }}", - "pull": false, - "commit": true - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": - [ - "provision/config_docker_{{ user `os_name`}}.sh", - "provision/config_ansible_{{ user `os_name`}}.sh", - "provision/config_ssh.sh" - ] + "variables": { + "odl_version": null, + "os_name": null, + "os_version": null, + "docker_repo": null, + "rpm_repo_file": null, + "rpm_repo_url": null }, - { - "type": "ansible-local", - "playbook_file": "provision/install_odl.yml", - "extra_arguments": [ - "--extra-vars", - "\"rpm_repo_file={{ user `rpm_repo_file` }}", - "rpm_repo_url={{ user `rpm_repo_url` }}\"" - ] - } - ], - "post-processors": [ - { - "type": "docker-tag", - "repository": "{{ user `docker_repo` }}", - "tag": "{{ user `odl_version` }}", - "force": false - } - ] + "builders": [ + { + "type": "docker", + "image": "{{ user `os_name` }}:{{ user `os_version` }}", + "pull": false, + "commit": true + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "provision/config_docker_{{ user `os_name`}}.sh", + "provision/config_ansible_{{ user `os_name`}}.sh", + "provision/config_ssh.sh" + ] + }, + { + "type": "ansible-local", + "playbook_file": "provision/install_odl.yml", + "extra_arguments": [ + "--extra-vars", + "\"rpm_repo_file={{ user `rpm_repo_file` }}", + "rpm_repo_url={{ user `rpm_repo_url` }}\"" + ] + } + ], + "post-processors": [ + { + "type": "docker-tag", + "repository": "{{ user `docker_repo` }}", + "tag": "{{ user `odl_version` }}", + "force": false + } + ] } diff --git a/packer/templates/libvirt.json b/packer/templates/libvirt.json index daf97f7..22c366f 100644 --- a/packer/templates/libvirt.json +++ b/packer/templates/libvirt.json @@ -1,54 +1,53 @@ { - "variables": { - "odl_version": null, - "os_name": null, - "os_version": null, - "iso_urls": null, - "iso_checksum": null, - "rpm_repo_file": null, - "rpm_repo_url": null - }, - "builders": [ - { - "type": "qemu", - "iso_urls": "{{ user `iso_urls` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha256", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_wait_timeout": "60m", - "shutdown_command": "sudo shutdown -P now", - "http_directory": ".", - "boot_command": [ - "text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/provision/{{ user `os_name` }}_kickstart.cfg" - ] - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": - [ - "provision/config_vagrant.sh", - "provision/config_ansible_{{ user `os_name`}}.sh", - "provision/config_ssh.sh" - ] + "variables": { + "odl_version": null, + "os_name": null, + "os_version": null, + "iso_urls": null, + "iso_checksum": null, + "rpm_repo_file": null, + "rpm_repo_url": null }, - { - "type": "ansible-local", - "playbook_file": "provision/install_odl.yml", - "extra_arguments": [ - "--extra-vars", - "\"rpm_repo_file={{ user `rpm_repo_file` }}", - "rpm_repo_url={{ user `rpm_repo_url` }}\"" - ] - } - ], - "post-processors": [ - { - "type": "vagrant", - "compression_level": "9", - "output": "opendaylight-{{ user `odl_version` }}-{{ user `os_name` }}-{{ user `os_version` }}-libvirt.box" - } - ] + "builders": [ + { + "type": "qemu", + "iso_urls": "{{ user `iso_urls` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha256", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_wait_timeout": "60m", + "shutdown_command": "sudo shutdown -P now", + "http_directory": ".", + "boot_command": [ + "text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/provision/{{ user `os_name` }}_kickstart.cfg" + ] + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "provision/config_vagrant.sh", + "provision/config_ansible_{{ user `os_name`}}.sh", + "provision/config_ssh.sh" + ] + }, + { + "type": "ansible-local", + "playbook_file": "provision/install_odl.yml", + "extra_arguments": [ + "--extra-vars", + "\"rpm_repo_file={{ user `rpm_repo_file` }}", + "rpm_repo_url={{ user `rpm_repo_url` }}\"" + ] + } + ], + "post-processors": [ + { + "type": "vagrant", + "compression_level": "9", + "output": "opendaylight-{{ user `odl_version` }}-{{ user `os_name` }}-{{ user `os_version` }}-libvirt.box" + } + ] } diff --git a/packer/templates/virtualbox.json b/packer/templates/virtualbox.json index 08acc4d..09e0701 100644 --- a/packer/templates/virtualbox.json +++ b/packer/templates/virtualbox.json @@ -1,71 +1,70 @@ { - "variables": { - "odl_version": null, - "os_name": null, - "os_version": null, - "guest_os_type": null, - "docker_repo": null, - "rpm_repo_file": null, - "rpm_repo_url": null - }, - "builders": [ - { - "type": "virtualbox-iso", - "guest_os_type": "{{ user `guest_os_type` }}", - "iso_urls": "{{ user `iso_urls` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha256", - "headless": "false", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_wait_timeout": "30m", - "shutdown_command": "sudo shutdown -P now", - "http_directory": ".", - "boot_command": [ - "text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/provision/{{ user `os_name` }}_kickstart.cfg" - ], - "vboxmanage": [ - [ - "modifyvm", - "{{ .Name }}", - "--memory", - "1024" - ], - [ - "modifyvm", - "{{ .Name }}", - "--cpus", - "2" - ] - ] - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": - [ - "provision/config_virtualbox_{{ user `os_name`}}.sh", - "provision/config_vagrant.sh", - "provision/config_ansible_{{ user `os_name`}}.sh", - "provision/config_ssh.sh" - ] + "variables": { + "odl_version": null, + "os_name": null, + "os_version": null, + "guest_os_type": null, + "docker_repo": null, + "rpm_repo_file": null, + "rpm_repo_url": null }, - { - "type": "ansible-local", - "playbook_file": "provision/install_odl.yml", - "extra_arguments": [ - "--extra-vars", - "\"rpm_repo_file={{ user `rpm_repo_file` }}", - "rpm_repo_url={{ user `rpm_repo_url` }}\"" - ] - } - ], - "post-processors": [ - { - "type": "vagrant", - "compression_level": "9", - "output": "opendaylight-{{ user `odl_version` }}-{{ user `os_name` }}-{{ user `os_version` }}-virtualbox.box" - } - ] + "builders": [ + { + "type": "virtualbox-iso", + "guest_os_type": "{{ user `guest_os_type` }}", + "iso_urls": "{{ user `iso_urls` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha256", + "headless": "false", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_wait_timeout": "30m", + "shutdown_command": "sudo shutdown -P now", + "http_directory": ".", + "boot_command": [ + "text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/provision/{{ user `os_name` }}_kickstart.cfg" + ], + "vboxmanage": [ + [ + "modifyvm", + "{{ .Name }}", + "--memory", + "1024" + ], + [ + "modifyvm", + "{{ .Name }}", + "--cpus", + "2" + ] + ] + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "provision/config_virtualbox_{{ user `os_name`}}.sh", + "provision/config_vagrant.sh", + "provision/config_ansible_{{ user `os_name`}}.sh", + "provision/config_ssh.sh" + ] + }, + { + "type": "ansible-local", + "playbook_file": "provision/install_odl.yml", + "extra_arguments": [ + "--extra-vars", + "\"rpm_repo_file={{ user `rpm_repo_file` }}", + "rpm_repo_url={{ user `rpm_repo_url` }}\"" + ] + } + ], + "post-processors": [ + { + "type": "vagrant", + "compression_level": "9", + "output": "opendaylight-{{ user `odl_version` }}-{{ user `os_name` }}-{{ user `os_version` }}-virtualbox.box" + } + ] } diff --git a/packer/vars/centos-7.2.1511.json b/packer/vars/centos-7.2.1511.json index 32fb0d4..fb0f631 100644 --- a/packer/vars/centos-7.2.1511.json +++ b/packer/vars/centos-7.2.1511.json @@ -1,7 +1,7 @@ { - "os_name": "centos", - "os_version": "7.2.1511", - "guest_os_type": "RedHat_64", - "iso_urls": "http://mirrors.rit.edu/centos/7.2.1511/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso", - "iso_checksum": "f90e4d28fa377669b2db16cbcb451fcb9a89d2460e3645993e30e137ac37d284" + "os_name": "centos", + "os_version": "7.2.1511", + "guest_os_type": "RedHat_64", + "iso_urls": "http://mirrors.rit.edu/centos/7.2.1511/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso", + "iso_checksum": "f90e4d28fa377669b2db16cbcb451fcb9a89d2460e3645993e30e137ac37d284" } diff --git a/packer/vars/fedora-24.json b/packer/vars/fedora-24.json index ea74c90..abf5323 100644 --- a/packer/vars/fedora-24.json +++ b/packer/vars/fedora-24.json @@ -1,7 +1,7 @@ { - "os_name": "fedora", - "os_version": "24", - "guest_os_type": "Fedora_64", - "iso_urls": "https://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/x86_64/iso/Fedora-Server-dvd-x86_64-24-1.2.iso", - "iso_checksum": "1c0971d4c1a37bb06ec603ed3ded0af79e22069499443bb2d47e501c9ef42ae8" + "os_name": "fedora", + "os_version": "24", + "guest_os_type": "Fedora_64", + "iso_urls": "https://download.fedoraproject.org/pub/fedora/linux/releases/24/Server/x86_64/iso/Fedora-Server-dvd-x86_64-24-1.2.iso", + "iso_checksum": "1c0971d4c1a37bb06ec603ed3ded0af79e22069499443bb2d47e501c9ef42ae8" } diff --git a/packer/vars/opendaylight-3.4.0.json b/packer/vars/opendaylight-3.4.0.json index 420f711..05eaf1e 100644 --- a/packer/vars/opendaylight-3.4.0.json +++ b/packer/vars/opendaylight-3.4.0.json @@ -1,6 +1,6 @@ { - "odl_version": "3.4.0", - "docker_repo": "opendaylight/odl", - "rpm_repo_file": "opendaylight-34-release.repo", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-34-release.repo'" + "odl_version": "3.4.0", + "docker_repo": "opendaylight/odl", + "rpm_repo_file": "opendaylight-34-release.repo", + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-34-release.repo'" } diff --git a/packer/vars/opendaylight-4.0.0.json b/packer/vars/opendaylight-4.0.0.json index 1a71656..cad56d3 100644 --- a/packer/vars/opendaylight-4.0.0.json +++ b/packer/vars/opendaylight-4.0.0.json @@ -1,6 +1,6 @@ { - "odl_version": "4.0.0", - "docker_repo": "opendaylight/odl", - "rpm_repo_file": "opendaylight-40-release.repo", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-40-release.repo'" + "odl_version": "4.0.0", + "docker_repo": "opendaylight/odl", + "rpm_repo_file": "opendaylight-40-release.repo", + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-40-release.repo'" } diff --git a/packer/vars/opendaylight-4.1.0.json b/packer/vars/opendaylight-4.1.0.json index 45f79ac..00e89ea 100644 --- a/packer/vars/opendaylight-4.1.0.json +++ b/packer/vars/opendaylight-4.1.0.json @@ -1,6 +1,6 @@ { - "odl_version": "4.1.0", - "docker_repo": "opendaylight/odl", - "rpm_repo_file": "opendaylight-41-release.repo", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-41-release.repo'" + "odl_version": "4.1.0", + "docker_repo": "opendaylight/odl", + "rpm_repo_file": "opendaylight-41-release.repo", + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-41-release.repo'" } diff --git a/packer/vars/opendaylight-4.2.0.json b/packer/vars/opendaylight-4.2.0.json index b9d28b0..f17ffb6 100644 --- a/packer/vars/opendaylight-4.2.0.json +++ b/packer/vars/opendaylight-4.2.0.json @@ -1,6 +1,6 @@ { - "odl_version": "4.2.0", - "docker_repo": "opendaylight/odl", - "rpm_repo_file": "opendaylight-42-release.repo", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-42-release.repo'" + "odl_version": "4.2.0", + "docker_repo": "opendaylight/odl", + "rpm_repo_file": "opendaylight-42-release.repo", + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-42-release.repo'" } diff --git a/packer/vars/opendaylight-4.3.0.json b/packer/vars/opendaylight-4.3.0.json index 9bbd846..e95750c 100644 --- a/packer/vars/opendaylight-4.3.0.json +++ b/packer/vars/opendaylight-4.3.0.json @@ -1,6 +1,6 @@ { - "odl_version": "4.3.0", - "docker_repo": "opendaylight/odl", - "rpm_repo_file": "opendaylight-43-release.repo", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-43-release.repo'" + "odl_version": "4.3.0", + "docker_repo": "opendaylight/odl", + "rpm_repo_file": "opendaylight-43-release.repo", + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-43-release.repo'" } diff --git a/packer/vars/opendaylight-4.4.0.json b/packer/vars/opendaylight-4.4.0.json index 6a0cd31..eb42c3d 100644 --- a/packer/vars/opendaylight-4.4.0.json +++ b/packer/vars/opendaylight-4.4.0.json @@ -1,6 +1,6 @@ { - "odl_version": "4.4.0", - "docker_repo": "opendaylight/odl", - "rpm_repo_file": "opendaylight-44-release.repo", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-44-release.repo'" + "odl_version": "4.4.0", + "docker_repo": "opendaylight/odl", + "rpm_repo_file": "opendaylight-44-release.repo", + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-44-release.repo'" } diff --git a/packer/vars/opendaylight-5.0.0.json b/packer/vars/opendaylight-5.0.0.json index 70b542f..66e1eb4 100644 --- a/packer/vars/opendaylight-5.0.0.json +++ b/packer/vars/opendaylight-5.0.0.json @@ -1,6 +1,6 @@ { - "odl_version": "5.0.0", - "docker_repo": "opendaylight/odl", - "rpm_repo_file": "opendaylight-50-release.repo", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-50-release.repo'" + "odl_version": "5.0.0", + "docker_repo": "opendaylight/odl", + "rpm_repo_file": "opendaylight-50-release.repo", + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-50-release.repo'" } -- 2.36.6