modify the network and indentity password

Change-Id: I000b580de67f01ea2b2a68ed0bfdefd09de610e8
Signed-off-by: baigk <baiguoku@huawei.com>

diff --git a/build.sh b/build.sh
index d3bc3f2..e24df44 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -32,12 +32,18 @@ function download_git()
     file_dir=$CACHE_DIR/${1%.*}
     if [[ -d $file_dir/.git ]]; then
         cd $file_dir
-        git pull origin master
+        source=`git remote -v | head -n 1  | awk '{print $2}'`
+        if [[ $2 == $source ]]; then
+            git pull origin master
+            if [[ $? -eq 0 ]]; then
+                cd -
+                return
+            fi
+        fi
         cd -
-    else
-        rm -rf $CACHE_DIR/$file_dir
-        git clone $2 $file_dir
     fi
+    rm -rf $CACHE_DIR/${1%.*}
+    git clone $2 $file_dir
 }
 
 function download_url()

diff --git a/deploy/adapters/ansible/roles/keystone/vars/main.yml b/deploy/adapters/ansible/roles/keystone/vars/main.yml
index dc660e9..7358225 100644 (file)
--- a/deploy/adapters/ansible/roles/keystone/vars/main.yml
+++ b/deploy/adapters/ansible/roles/keystone/vars/main.yml
@@ -99,7 +99,7 @@ os_users:
     tenant_description: "Service Tenant"
 
   - user: keystone
-    password: "{{ keystone_PASS }}"
+    password: "{{ KEYSTONE_PASS }}"
     email: keystone@admin.com
     role: admin
     tenant: service

diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 440b3e0..d7d2f4e 100644 (file)
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -59,6 +59,6 @@ export GATEWAY="10.1.0.1"
 export SERVER_CREDENTIAL="root=root"
 export LOCAL_REPO_URL=""
 export OS_CONFIG_FILENAME=""
-export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,metering:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_secret"
-export CONSOLE_CREDENTIALS="admin:console=console,compute:console=console,dashboard:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_db_secret"
+export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,image:service=service,metering:service=service,network:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_db_secret"
+export CONSOLE_CREDENTIALS="admin:console=console,demo:console=console,compute:console=console,dashboard:console=console,identity:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_secret"
 export PACKAGE_CONFIG_FILENAME=""