Permalink
Browse files

MCF VM runs bosh_agent on https, but agent_client 0.1.1 does not supp…

…ort that
  • Loading branch information...
1 parent f0f0474 commit 90b06cc47791aef8d713c5b9573fc264c25a39b5 @arkxu arkxu committed Apr 26, 2013
Showing with 58 additions and 42 deletions.
  1. +1 −1 micro/Gemfile
  2. +37 −37 micro/Gemfile.lock
  3. +1 −1 micro/lib/micro/bosh_wrapper.rb
  4. +15 −0 scripts/README.md
  5. +4 −3 scripts/create_mcf.sh
View
@@ -9,13 +9,13 @@ gem 'sigar', '>=0.7.2'
gem 'uuidtools'
gem 'yajl-ruby', require: 'yajl/json_gem'
gem 'json'
-gem 'agent_client'
gem 'bosh_common'
gem 'rest-client'
gem 'ruby-graphviz'
gem 'cfoundry', '~> 0.5.0'
git 'git://github.com/cloudfoundry/bosh.git' do
+ gem 'agent_client'
gem 'monit_api'
gem 'bosh_encryption'
gem 'bosh_agent'
View
@@ -1,47 +1,44 @@
GIT
remote: git://github.com/cloudfoundry/bosh.git
- revision: e83c8c5d6b1a6127597b844d451975297d368b06
+ revision: 7f5c0088ebc289d41cd9b96b927ba08ce6d09dc0
specs:
- blobstore_client (1.5.0.pre)
- aws-sdk (~> 1.8.1.1)
- bosh_common (~> 1.5.0.pre)
- fog (~> 1.9.0)
+ agent_client (1.5.0.pre.3)
+ httpclient (= 2.2.4)
+ yajl-ruby (~> 1.1.0)
+ blobstore_client (1.5.0.pre.3)
+ aws-sdk (= 1.8.5)
+ bosh_common (~> 1.5.0.pre.3)
+ fog (~> 1.10.1)
httpclient (= 2.2.4)
multi_json (~> 1.1)
ruby-atmos-pure (~> 1.0.5)
- uuidtools (~> 2.1.2)
- bosh_agent (1.5.0.pre)
- blobstore_client (~> 1.5.0.pre)
- bosh_common (~> 1.5.0.pre)
- bosh_encryption (~> 1.5.0.pre)
+ bosh_agent (1.5.0.pre.3)
+ blobstore_client (~> 1.5.0.pre.3)
+ bosh_common (~> 1.5.0.pre.3)
+ bosh_encryption (~> 1.5.0.pre.3)
highline (~> 1.6.2)
httpclient (= 2.2.4)
- monit_api (~> 1.5.0.pre)
+ monit_api (~> 1.5.0.pre.3)
nats (~> 0.4.28)
netaddr (~> 1.5.0)
- posix-spawn (~> 0.3.6)
ruby-atmos-pure (~> 1.0.5)
- sigar (>= 0.7.2)
- sinatra (~> 1.2.8)
+ sigar (~> 0.7.2)
+ sinatra (~> 1.4.2)
sys-filesystem (~> 1.1.0)
thin (~> 1.5.0)
- uuidtools (~> 2.1.3)
+ uuidtools (~> 2.1.2)
yajl-ruby (~> 1.1.0)
- bosh_common (1.5.0.pre)
- bosh_encryption (1.5.0.pre)
+ bosh_common (1.5.0.pre.3)
+ bosh_encryption (1.5.0.pre.3)
gibberish (~> 1.2.0)
- uuidtools (~> 2.1.3)
yajl-ruby (~> 1.1.0)
- monit_api (1.5.0.pre)
+ monit_api (1.5.0.pre.3)
crack (~> 0.3.2)
GEM
remote: https://rubygems.org/
specs:
- agent_client (0.1.1)
- httpclient
- yajl-ruby
- aws-sdk (1.8.1.3)
+ aws-sdk (1.8.5)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
@@ -65,23 +62,23 @@ GEM
daemons (1.1.9)
diff-lcs (1.1.3)
eventmachine (0.12.10)
- excon (0.16.10)
+ excon (0.20.1)
execjs (1.4.0)
multi_json (~> 1.0)
fakeweb (1.3.0)
ffi (1.3.1)
- fog (1.9.0)
+ fog (1.10.1)
builder
- excon (~> 0.14)
+ excon (~> 0.20)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
- net-scp (~> 1.0.4)
+ net-scp (~> 1.1)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.4)
- gibberish (1.2.1)
+ gibberish (1.2.2)
highline (1.6.15)
hike (1.2.1)
httpclient (2.2.4)
@@ -103,14 +100,16 @@ GEM
eventmachine (= 0.12.10)
json_pure (>= 1.7.3)
thin (>= 1.4.1)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-ssh (2.6.5)
+ net-scp (1.1.0)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.6.7)
netaddr (1.5.0)
- nokogiri (1.5.6)
+ nokogiri (1.5.9)
posix-spawn (0.3.6)
progressbar (0.20.0)
rack (1.5.2)
+ rack-protection (1.5.0)
+ rack
rack-rewrite (1.3.3)
rack-test (0.6.2)
rack (>= 1.0)
@@ -147,9 +146,10 @@ GEM
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- sinatra (1.2.8)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
+ sinatra (1.4.2)
+ rack (~> 1.5, >= 1.5.2)
+ rack-protection (~> 1.4)
+ tilt (~> 1.3, >= 1.3.4)
sprockets (2.8.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -165,7 +165,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- tilt (1.3.3)
+ tilt (1.3.7)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -177,7 +177,7 @@ PLATFORMS
ruby
DEPENDENCIES
- agent_client
+ agent_client!
blobstore_client!
bosh_agent!
bosh_common
@@ -101,7 +101,7 @@ def restart_services
# Create an HTTP client for the Bosh agent.
def agent_client
- Bosh::Agent::Client.create('http://localhost:6969',
+ Bosh::Agent::Client.create('https://localhost:6969',
'user' => 'vcap',
'password' => 'vcap')
end
View
@@ -0,0 +1,15 @@
+create_mcf.sh is a bash script that can build a micro cf VM automatically.
+
+By default it gets the master branch of cf-release & micro, but you can set the environment variable to change it.
+
+e.g.
+
+`export CF_RELEASE_BRANCH=release-candidate`
+
+`export MICRO_GIT=https://github.com/{yourfork}/micro.git`
+
+`export MICRO_BRANCH={yourbranch}`
+
+And then adding -E when running the script. (It will preserve the environment variables from the current user).
+
+`sudo -E ./create_mcf.sh`
View
@@ -14,6 +14,7 @@ BOSH_DIR=${BOSH_DIR:-${REPOS_DIR}/bosh}
CF_RELEASE_GIT=${CF_RELEASE_GIT:-https://github.com/cloudfoundry/cf-release.git}
MICRO_GIT=${MICRO_GIT:-https://github.com/cloudfoundry/micro.git}
+MICRO_BRANCH=${MICRO_BRANCH:-master}
BOSH_GIT=${BOSH_GIT:-https://github.com/cloudfoundry/bosh.git}
UBUNTU_RELEASE=`lsb_release -c -s`
@@ -82,16 +83,16 @@ cd ${CF_RELEASE_DIR}
# Remove when https://github.com/cloudfoundry/cf-release/pull/25 gets merged.
sed -i 's#git@github.com:#https://github.com/#g' .gitmodules
sed -i 's#git://github.com#https://github.com#g' .gitmodules
-./update
+git submodule foreach --recursive git submodule sync && git submodule update --init --recursive
bosh -n --color create release --force --with-tarball
if [[ ! -d ${MICRO_DIR} ]]; then
echo "Cloning micro repository..."
- git clone ${MICRO_GIT} ${MICRO_DIR}
+ git clone -b ${MICRO_BRANCH} ${MICRO_GIT} ${MICRO_DIR}
else
echo "Updating micro repository..."
cd ${MICRO_DIR}
- git pull origin master
+ git pull origin ${MICRO_BRANCH}
fi
cd ${MICRO_DIR}/micro
rm -rf .bundle

0 comments on commit 90b06cc

Please sign in to comment.