Change deployment into 2 steps

Also add deploying of rpc and notifications in 1st step and turn off ssl
for etcd.

Change-Id: I07bff12530309fb20efd700ce6ea1406bece72af
This commit is contained in:
Artur Zarzycki 2017-03-14 09:09:56 +01:00
parent 0be6f41598
commit 0f90ba5b33
1 changed files with 7 additions and 9 deletions

View File

@ -139,8 +139,10 @@ registry:
address: "${REGISTRY_IP}:${REGISTRY_PORT}"
timeout: 1500
replicas:
etcd: 3
database: 3
rpc: 3
notifications: 1
repositories:
path: /tmp/ccp-repos
skip_empty: True
@ -180,6 +182,9 @@ repositories:
name: ironic
configs:
private_interface: ens3
etcd:
tls:
enabled: false
nodes:
node[1-3]:
roles:
@ -312,25 +317,18 @@ function ccp_install {
function deploy_ccp {
pwd
${SCP_COMMAND} ccp.yml vagrant@"${ADMIN_IP}":~/
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml build -c etcd memcached rabbitmq galera percona"
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml deploy -c etcd memcached database"
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml build -c etcd memcached rabbitmq galera percona rabbitmq"
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml deploy -c etcd memcached database rpc notifications"
ccp_wait_for_deployment_to_finish 70
if [ $? -ne 0 ]; then
return 1
fi
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml build -c keystone nginx"
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml deploy -c keystone"
ccp_wait_for_deployment_to_finish 30
if [ $? -ne 0 ]; then
return 1
fi
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml build"
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml deploy"
ccp_wait_for_deployment_to_finish 200
if [ $? -ne 0 ]; then
return 1
fi
}
prepare_k8s_env