Skip to content

Commit

Permalink
Merge pull request #2 from yuewko/fix_run_scripts
Browse files Browse the repository at this point in the history
Fix daemon run scripts
  • Loading branch information
johnbelamaric authored Jun 27, 2016
2 parents 585f58c + a49c5e3 commit 79828fc
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 38 deletions.
14 changes: 4 additions & 10 deletions run-aci-daemon.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
#!/bin/bash

# rm /run/cni/infoblox.sock

DRIVER_NAME="infoblox"
SOCKET_DIR="/run/cni"
# GRID_HOST="192.168.124.200"
GRID_HOST="172.22.138.129"
GRID_HOST="192.168.124.200"
WAPI_PORT="443"
WAPI_USERNAME="cloudadmin"
WAPI_PASSWORD="cloudadmin"
WAPI_USERNAME=""
WAPI_PASSWORD=""
WAPI_VERSION="2.0"
#SSL_VERIFY="./infoblox-localdomain.crt"
SSL_VERIFY=false
#SSL_VERIFY="./crap.crt"
NETWORK_VIEW="yko_openstack"
NETWORK_VIEW="default"
NETWORK_CONTAINER="192.168.0.0/24,192.169.0.0/24"
PREFIX_LENGTH=25



rkt --insecure-options=image --volume run-cni,kind=host,source=/run/cni run ./infoblox-cni-daemon.aci -- --grid-host=${GRID_HOST} --wapi-port=${WAPI_PORT} --wapi-username=${WAPI_USERNAME} --wapi-password=${WAPI_PASSWORD} --wapi-version=${WAPI_VERSION} --socket-dir=${SOCKET_DIR} --driver-name=${DRIVER_NAME} --ssl-verify=${SSL_VERIFY} --network-view=${NETWORK_VIEW} --network-container=${NETWORK_CONTAINER} --prefix-length=${PREFIX_LENGTH}
14 changes: 4 additions & 10 deletions run-daemon.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
#!/bin/bash

# rm /run/cni/infoblox.sock

DRIVER_NAME="infoblox"
SOCKET_DIR="/run/cni"
# GRID_HOST="192.168.124.200"
GRID_HOST="infoblox.localdomain"
GRID_HOST="192.168.124.200"
WAPI_PORT="443"
WAPI_USERNAME="cloudadmin"
WAPI_PASSWORD="cloudadmin"
WAPI_USERNAME=""
WAPI_PASSWORD=""
WAPI_VERSION="2.0"
#SSL_VERIFY="./infoblox-localdomain.crt"
SSL_VERIFY=false
#SSL_VERIFY="./crap.crt"
NETWORK_VIEW="yko_openstack"
NETWORK_VIEW="default"
NETWORK_CONTAINER="192.168.0.0/24,192.169.0.0/24"
PREFIX_LENGTH=25



./infoblox-daemon --grid-host=${GRID_HOST} --wapi-port=${WAPI_PORT} --wapi-username=${WAPI_USERNAME} --wapi-password=${WAPI_PASSWORD} --wapi-version=${WAPI_VERSION} --socket-dir=${SOCKET_DIR} --driver-name=${DRIVER_NAME} --ssl-verify=${SSL_VERIFY} --network-view=${NETWORK_VIEW} --network-container=${NETWORK_CONTAINER} --prefix-length=${PREFIX_LENGTH}
14 changes: 5 additions & 9 deletions run-docker-daemon.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
#!/bin/bash

# rm /run/cni/infoblox.sock

DRIVER_NAME="infoblox"
SOCKET_DIR="/run/cni"
# GRID_HOST="192.168.124.200"
GRID_HOST="172.22.138.129"
GRID_HOST="192.168.124.200"
WAPI_PORT="443"
WAPI_USERNAME="cloudadmin"
WAPI_PASSWORD="cloudadmin"
WAPI_USERNAME=""
WAPI_PASSWORD=""
WAPI_VERSION="2.0"
#SSL_VERIFY="./infoblox-localdomain.crt"
SSL_VERIFY=false
#SSL_VERIFY="./crap.crt"
NETWORK_VIEW="yko_openstack"
NETWORK_VIEW="default"
NETWORK_CONTAINER="192.168.0.0/24,192.169.0.0/24"
PREFIX_LENGTH=25


docker run -v /run/cni:/run/cni infoblox-cni-daemon --grid-host=${GRID_HOST} --wapi-port=${WAPI_PORT} --wapi-username=${WAPI_USERNAME} --wapi-password=${WAPI_PASSWORD} --wapi-version=${WAPI_VERSION} --socket-dir=${SOCKET_DIR} --driver-name=${DRIVER_NAME} --ssl-verify=${SSL_VERIFY} --network-view=${NETWORK_VIEW} --network-container=${NETWORK_CONTAINER} --prefix-length=${PREFIX_LENGTH}
16 changes: 16 additions & 0 deletions run-rkt-daemon.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

DRIVER_NAME="infoblox"
SOCKET_DIR="/run/cni"
GRID_HOST="192.168.124.200"
WAPI_PORT="443"
WAPI_USERNAME=""
WAPI_PASSWORD=""
WAPI_VERSION="2.0"
SSL_VERIFY=false
NETWORK_VIEW="default"
NETWORK_CONTAINER="192.168.0.0/24,192.169.0.0/24"
PREFIX_LENGTH=25


rkt --insecure-options=image --volume run-cni,kind=host,source=/run/cni --mount volume=run-cni,target=/run/cni run docker://yuewko/infoblox-cni-daemon -- --grid-host=${GRID_HOST} --wapi-port=${WAPI_PORT} --wapi-username=${WAPI_USERNAME} --wapi-password=${WAPI_PASSWORD} --wapi-version=${WAPI_VERSION} --socket-dir=${SOCKET_DIR} --driver-name=${DRIVER_NAME} --ssl-verify=${SSL_VERIFY} --network-view=${NETWORK_VIEW} --network-container=${NETWORK_CONTAINER} --prefix-length=${PREFIX_LENGTH}
9 changes: 0 additions & 9 deletions run.sh

This file was deleted.

0 comments on commit 79828fc

Please sign in to comment.