Repository: stratos Updated Branches: refs/heads/master 7f1c44aae -> 3eedcf743
clean up puppetmaster image Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2690d148 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2690d148 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2690d148 Branch: refs/heads/master Commit: 2690d148d34b4af736a263dcc8f51e760676d570 Parents: 48a6b2f Author: Chris Snow <[email protected]> Authored: Fri Aug 29 16:53:00 2014 +0000 Committer: Chris Snow <[email protected]> Committed: Fri Aug 29 16:53:00 2014 +0000 ---------------------------------------------------------------------- .../stratos-docker-images/puppetmaster/addpuppetdomain.txt | 5 ----- tools/stratos-docker-images/puppetmaster/run-example.sh | 9 --------- 2 files changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2690d148/tools/stratos-docker-images/puppetmaster/addpuppetdomain.txt ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/puppetmaster/addpuppetdomain.txt b/tools/stratos-docker-images/puppetmaster/addpuppetdomain.txt deleted file mode 100644 index 90112eb..0000000 --- a/tools/stratos-docker-images/puppetmaster/addpuppetdomain.txt +++ /dev/null @@ -1,5 +0,0 @@ -server 127.0.0.1 -zone example.com -prereq nxdomain puppetmaster.example.com. -update add puppetmaster.example.com. 10 A 192.168.56.10 -send http://git-wip-us.apache.org/repos/asf/stratos/blob/2690d148/tools/stratos-docker-images/puppetmaster/run-example.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/puppetmaster/run-example.sh b/tools/stratos-docker-images/puppetmaster/run-example.sh index b7dc3fc..89d9566 100755 --- a/tools/stratos-docker-images/puppetmaster/run-example.sh +++ b/tools/stratos-docker-images/puppetmaster/run-example.sh @@ -27,16 +27,7 @@ MB_HOSTNAME= MB_PORT= TRUSTSTORE_PASSWORD=wso2carbon - -# To run interactively: -# docker run -i -t -e "DOMAIN=${DOMAIN}" -e "MASTERHOSTNAME=${MASTERHOSTNAME}" -p 8140 apachestratos/puppet /bin/bash - PUPPET_ID=$(docker run -d --dns=${IP_ADDR} -e "DOMAIN=${DOMAIN}" -e "MASTERHOSTNAME=${MASTERHOSTNAME}" -p 8140 apachestratos/puppet) PUPPET_IP_ADDR=$(docker inspect --format '{{ .NetworkSettings.Gateway }}' $PUPPET_ID) PUPPET_PORT=$(docker port $PUPPET_ID 8140 | awk -F':' '{ print $2 }') -# TODO create a docker cartridge -# add dns record for cartridge, e.g. cartridge1.$DOMAIN -# start puppet agent in cartridge to test puppetmaster: -# puppet agent --server ${MASTERHOSTNAME} --masterport ${PUPPET_PORT} --test --verbose --debug -
