From 62986bba9e065d4148767b091ae326cf1e0c242f Mon Sep 17 00:00:00 2001 From: JuPing Date: Fri, 21 Aug 2015 10:53:31 +0000 Subject: [PATCH] Rename manifest.yml to manifest.yaml Yaml suggest to use .yaml when possible: http://www.yaml.org/faq.html This patch renames manifest.yml to manifest.yaml. Change-Id: I5b0e648af594a67d14916d69bb4acc56512da647 Closes-Bug: #1487405 --- CloudFoundryDiego/package/Resources/InstallBosh.template | 2 +- CloudFoundryDiego/package/Resources/scripts/config.json | 2 +- CloudFoundryDiego/package/Resources/scripts/installBosh.sh | 4 ++-- .../package/Resources/scripts/{manifest.yml => manifest.yaml} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename CloudFoundryDiego/package/Resources/scripts/{manifest.yml => manifest.yaml} (100%) diff --git a/CloudFoundryDiego/package/Resources/InstallBosh.template b/CloudFoundryDiego/package/Resources/InstallBosh.template index b4d00c95..cc97f440 100644 --- a/CloudFoundryDiego/package/Resources/InstallBosh.template +++ b/CloudFoundryDiego/package/Resources/InstallBosh.template @@ -28,7 +28,7 @@ Scripts: Files: - - - - + - Options: captureStdout: true captureStderr: true diff --git a/CloudFoundryDiego/package/Resources/scripts/config.json b/CloudFoundryDiego/package/Resources/scripts/config.json index 4ee7e343..475bcafd 100644 --- a/CloudFoundryDiego/package/Resources/scripts/config.json +++ b/CloudFoundryDiego/package/Resources/scripts/config.json @@ -22,6 +22,6 @@ }, "deployment_provisioner": { - "manifest_path": "/root/workspace/manifest.yml" + "manifest_path": "/root/workspace/manifest.yaml" } } diff --git a/CloudFoundryDiego/package/Resources/scripts/installBosh.sh b/CloudFoundryDiego/package/Resources/scripts/installBosh.sh index cbe5b1cb..b067281c 100755 --- a/CloudFoundryDiego/package/Resources/scripts/installBosh.sh +++ b/CloudFoundryDiego/package/Resources/scripts/installBosh.sh @@ -29,10 +29,10 @@ include "common.sh" mkdir -p /root/workspace install -D -g root -o root -m 0644 config.json /root/workspace -install -D -g root -o root -m 0644 manifest.yml /root/workspace +install -D -g root -o root -m 0644 manifest.yaml /root/workspace IP=$(ip addr | grep 'inet .*global' | cut -f 6 -d ' ' | cut -f1 -d '/' | head -n 1) -sed -i "s/_local_ip_/$IP/g" /root/workspace/manifest.yml +sed -i "s/_local_ip_/$IP/g" /root/workspace/manifest.yaml apt-get update apt-get -o Dpkg::Options::="--force-confnew" -y install git build-essential ruby ruby-dev libxml2-dev libsqlite3-dev libxslt1-dev libpq-dev libmysqlclient-dev diff --git a/CloudFoundryDiego/package/Resources/scripts/manifest.yml b/CloudFoundryDiego/package/Resources/scripts/manifest.yaml similarity index 100% rename from CloudFoundryDiego/package/Resources/scripts/manifest.yml rename to CloudFoundryDiego/package/Resources/scripts/manifest.yaml