x/sahara-ci-config
Code Issues Proposed changes

Fix variables with host credentials

Browse Source 
Update variables with tenant id and host ip

Change-Id: I9d55c23293cac9defda4b3b2f98823b86ceacd26
This commit is contained in:
Evgeny Sikachev 2016-04-13 17:26:23 +03:00
parent 5e6190ddd1
commit f773f20f93
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/devstack/local.sh
View File

@ -18,7 +18,7 @@ MYSQL_CONF=/etc/mysql/my.cnf
INTERFACE='br-ex'
source $TOP_DIR/functions-common
if [[ $(hostname -s) =~ 42 ]]; then
if [[ $(hostname -s) =~ trusty-42 ]]; then
HOST_IP='172.18.168.42'
else
HOST_IP='172.18.168.43'

2
config/devstack/localrc
View File

@ -35,7 +35,7 @@ VOLUME_BACKING_FILE_SIZE=100000M
KEYSTONE_TOKEN_FORMAT=UUID
FIXED_NETWORK_SIZE=256
if [[ $(hostname -s) =~ 42 ]]; then
if [[ $(hostname -s) =~ trusty-42 ]]; then
FLOATING_RANGE=172.18.169.0/26
PUBLIC_NETWORK_GATEWAY=172.18.169.1
else

4
config/nodepool/sahara.yaml
View File

@ -32,7 +32,7 @@ providers:
boot-timeout: 120
pool: public
networks:
- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_42'
- net-id: 'LAB_42_PRIVATE_NETWORK_ID'
images:
- name: trusty-42
base-image: 'ubuntu-14.04'
@ -48,7 +48,7 @@ providers:
boot-timeout: 120
pool: public
networks:
- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_43'
- net-id: 'LAB_43_PRIVATE_NETWORK_ID'
images:
- name: trusty-43
base-image: 'ubuntu-14.04'

10
slave-scripts/integration-cleanup.sh
View File

@ -9,13 +9,13 @@ job_type=$(echo $PREV_JOB | awk -F '-' '{ print $1 }')
export os_username=$os_username
export os_password=$os_password
export os_tenant_name=$os_tenant_name
if [[ "$HOST_NAME" =~ 42 ]]; then
export os_auth_url="http://$OPENSTACK_HOST_42_LAB:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_42_NEUTRON_LAB:8004/v1/$LAB_42_TENANT_ID"
if [[ "$HOST_NAME" =~ trusty-42 ]]; then
export os_auth_url="http://$OPENSTACK_HOST_LAB_42:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_LAB_42:8004/v1/$LAB_42_TENANT_ID"
host="c1"
else
export os_auth_url="http://$OPENSTACK_HOST_43_LAB:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_HOST_43_LAB:8004/v1/$LAB_43_TENANT_ID"
export os_auth_url="http://$OPENSTACK_HOST_LAB_43:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_HOST_LAB_43:8004/v1/$LAB_43_TENANT_ID"
host="c2"
fi
if [[ $(echo $PREV_JOB | awk -F '-' '{ print $2 }') =~ ui ]]; then

4
slave-scripts/update_config.sh
View File

@ -9,8 +9,8 @@ sudo su - zuul -c "cat $WORKSPACE/config/zuul/logging.conf > /etc/zuul/logging.c
sudo su - zuul -c "cat $WORKSPACE/config/zuul/openstack_functions.py > /etc/zuul/openstack_functions.py"
sudo service zuul reload
sed "s%- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_42'%- net-id: '$NEUTRON_LAB_PRIVATE_NETWORK_ID_42'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_43'%- net-id: '$NOVA_NET_LAB_PRIVATE_NETWORK_ID_43'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%- net-id: 'LAB_42_PRIVATE_NETWORK_ID'%- net-id: '$LAB_42_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%- net-id: 'LAB_43_PRIVATE_NETWORK_ID'%- net-id: '$LAB_43_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%apikey: JENKINS_API_KEY%apikey: $JENKINS_API_KEY%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%credentials-id: CREDENTIALS_ID%credentials-id: $CREDENTIALS_ID%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sudo su - nodepool -c "cat $WORKSPACE/config/nodepool/sahara.yaml > /etc/nodepool/nodepool.yaml"