diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-05-05 14:37:26 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-05-05 14:37:26 +0000 |
| commit | a011ef9ae9c06a0270c77564e1b031e68e8404fa (patch) | |
| tree | bd7a159a570505910098dc9826a65612f63c280c | |
| parent | d13a1ffc8eb4af023ae85a7de1b1e216beaaa6e4 (diff) | |
[DCAE-7] Supporting vanilla OpenStack
Change-Id: I5162b7bfb74adbb074335955f675e79345c46d41
Signed-off-by: Carsten Lund <lund@research.att.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | boot/dcae_install.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..1c44a074 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/.project +.*.sw? diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 0d347b6a..8ec7edbd 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -28,6 +28,7 @@ NEXUS_USER=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWORD=$(cat /opt/config/nexus_password.txt) NEXUS_URL_SNAPSHOTS=$(cat /opt/config/nexus_url_snapshots.txt) DOCKER_REGISTRY=$(cat /opt/config/nexus_docker_repo.txt) +DOCKER_VERSION=$(cat /opt/config/docker_version.txt) DCAE_CODE_VERSION=$(cat /opt/config/dcae_code_version.txt) DCAE_IP_ADDR=$(cat /opt/config/dcae_ip_addr.txt) @@ -106,6 +107,7 @@ mkdir -p /opt/app/dcae-controller cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG BASE: $BASE ZONE: $ZONE +DNS-IP-ADDR=$DNS_IP_ADDR STATE: $STATE DCAE-VERSION: $DCAE_CODE_VERSION HORIZON-URL: $HORIZON_URL/$OPENSTACK_USER @@ -127,6 +129,7 @@ NEXUS-URL-SNAPSHOTS: $NEXUS_URL_SNAPSHOTS NEXUS-RAWURL: $NEXUS_REPO DOCKER-REGISTRY: $DOCKER_REGISTRY +DOCKER-VERSION: $DOCKER_VERSION GIT-MR-REPO: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git @@ -164,4 +167,4 @@ fi # Run docker containers cd /opt -./dcae_vm_init.sh
\ No newline at end of file +./dcae_vm_init.sh |