You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/01/06 11:04:21 UTC
[2/6] brooklyn-dist git commit: Additional ubuntu script changes
Additional ubuntu script changes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/08aba913
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/08aba913
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/08aba913
Branch: refs/heads/master
Commit: 08aba9135113220fa484cd8649056af789f90878
Parents: 6541acd
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Tue Dec 6 18:18:32 2016 +0000
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Tue Dec 6 18:18:32 2016 +0000
----------------------------------------------------------------------
vagrant/src/main/vagrant/files/brooklyn.service | 8 +++----
.../src/main/vagrant/files/install_brooklyn.sh | 12 +++++------
vagrant/src/main/vagrant/servers.yaml | 22 +++++++++++++++++++-
3 files changed, 31 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/08aba913/vagrant/src/main/vagrant/files/brooklyn.service
----------------------------------------------------------------------
diff --git a/vagrant/src/main/vagrant/files/brooklyn.service b/vagrant/src/main/vagrant/files/brooklyn.service
index 28b0fea..984121a 100644
--- a/vagrant/src/main/vagrant/files/brooklyn.service
+++ b/vagrant/src/main/vagrant/files/brooklyn.service
@@ -22,11 +22,11 @@ Description=Apache Brooklyn service
Documentation=http://brooklyn.apache.org/documentation/index.html
[Service]
-ExecStart=/home/vagrant/apache-brooklyn/bin/brooklyn launch --persist auto --persistenceDir /vagrant/brooklyn-persisted-state --catalogAdd /vagrant/files/vagrant-catalog.bom
-WorkingDirectory=/home/vagrant/apache-brooklyn
+ExecStart=/home/ubuntu/apache-brooklyn/bin/brooklyn launch --persist auto --persistenceDir /vagrant/brooklyn-persisted-state --catalogAdd /vagrant/files/vagrant-catalog.bom
+WorkingDirectory=/home/ubuntu/apache-brooklyn
Restart=on-abort
-User=vagrant
-Group=vagrant
+User=ubuntu
+Group=ubuntu
[Install]
WantedBy=multi-user.target
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/08aba913/vagrant/src/main/vagrant/files/install_brooklyn.sh
----------------------------------------------------------------------
diff --git a/vagrant/src/main/vagrant/files/install_brooklyn.sh b/vagrant/src/main/vagrant/files/install_brooklyn.sh
index 0f5d09f..e832ed9 100755
--- a/vagrant/src/main/vagrant/files/install_brooklyn.sh
+++ b/vagrant/src/main/vagrant/files/install_brooklyn.sh
@@ -48,11 +48,11 @@ fi
if [ ! "${INSTALL_FROM_LOCAL_DIST}" == "true" ]; then
if [ ! -z "${BROOKLYN_VERSION##*-SNAPSHOT}" ] ; then
# url for official release versions
- BROOKLYN_URL="https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-${BROOKLYN_VERSION}/apache-brooklyn-${BROOKLYN_VERSION}-bin.tar.gz"
+ BROOKLYN_URL="https://dist.apache.org/repos/dist/dev/brooklyn/apache-brooklyn-0.10.0-rc1/apache-brooklyn-0.10.0-rc1-bin.tar.gz"
BROOKLYN_DIR="apache-brooklyn-${BROOKLYN_VERSION}-bin"
else
# url for community-managed snapshots
- BROOKLYN_URL="https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=brooklyn-dist&v=${BROOKLYN_VERSION}&c=dist&e=tar.gz"
+ #BROOKLYN_URL="https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=brooklyn-dist&v=${BROOKLYN_VERSION}&c=dist&e=tar.gz"
BROOKLYN_DIR="brooklyn-dist-${BROOKLYN_VERSION}"
fi
else
@@ -78,12 +78,12 @@ tar zxf ${TMP_ARCHIVE_NAME}
echo "Creating Brooklyn dirs and symlinks"
ln -s ${BROOKLYN_DIR} apache-brooklyn
sudo mkdir -p /var/log/brooklyn
-sudo chown -R vagrant:vagrant /var/log/brooklyn
-mkdir -p /home/vagrant/.brooklyn
+sudo chown -R ubuntu:ubuntu /var/log/brooklyn
+mkdir -p /home/ubuntu/.brooklyn
echo "Copying default vagrant Brooklyn properties file"
-cp /vagrant/files/brooklyn.properties /home/vagrant/.brooklyn/
-chmod 600 /home/vagrant/.brooklyn/brooklyn.properties
+cp /vagrant/files/brooklyn.properties /home/ubuntu/.brooklyn/
+chmod 600 /home/ubuntu/.brooklyn/brooklyn.properties
echo "Installing JRE"
sudo sh -c 'export DEBIAN_FRONTEND=noninteractive; apt-get install --yes openjdk-8-jre-headless'
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/08aba913/vagrant/src/main/vagrant/servers.yaml
----------------------------------------------------------------------
diff --git a/vagrant/src/main/vagrant/servers.yaml b/vagrant/src/main/vagrant/servers.yaml
index 0267f9a..ba0f9db 100644
--- a/vagrant/src/main/vagrant/servers.yaml
+++ b/vagrant/src/main/vagrant/servers.yaml
@@ -47,7 +47,7 @@ servers:
autocorrect: true
shell:
env:
- BROOKLYN_VERSION: "0.11.0-SNAPSHOT"
+ BROOKLYN_VERSION: "0.10.0"
INSTALL_FROM_LOCAL_DIST: false
cmd:
- ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa
@@ -60,19 +60,39 @@ servers:
ram: 512
cpus: 2
ip: 10.10.10.101
+ shell:
+ env: {}
+ cmd:
+ - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+ - sudo service sshd restart
- name: byon2
box: centos/7
ram: 512
cpus: 2
ip: 10.10.10.102
+ shell:
+ env: {}
+ cmd:
+ - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+ - sudo service sshd restart
- name: byon3
box: centos/7
ram: 512
cpus: 2
ip: 10.10.10.103
+ shell:
+ env: {}
+ cmd:
+ - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+ - sudo service sshd restart
- name: byon4
box: centos/7
ram: 512
cpus: 2
ip: 10.10.10.104
+ shell:
+ env: {}
+ cmd:
+ - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+ - sudo service sshd restart
...