x/sahara-ci-config
Code Issues Proposed changes

Update nodepool configs

Browse Source 
Format of nodepool configs was chaged.

Change-Id: Ib9d2aefbb1dd03b0074a8a82bee52b43bcf96876
This commit is contained in:
Evgeny Sikachev 2016-04-15 16:27:22 +03:00
parent f773f20f93
commit 20e203d70e
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/nodepool/sahara.yaml
View File

@ -1,5 +1,4 @@
script-dir: /opt/ci/files/nodepool-scripts
dburi: 'mysql://nodepool@localhost/nodepool'
cron:
check: '*/1 * * * *'
@ -27,10 +26,11 @@ providers:
username: 'ci-user'
password: 'nova'
auth-url: 'http://172.18.168.42:5000/v2.0'
project-id: 'ci'
project-name: 'ci'
max-servers: 6
boot-timeout: 120
pool: public
ipv6-preferred: False
pool: 'public'
networks:
- net-id: 'LAB_42_PRIVATE_NETWORK_ID'
images:
@ -43,10 +43,11 @@ providers:
username: 'ci-user'
password: 'nova'
auth-url: 'http://172.18.168.43:5000/v2.0'
project-id: 'ci'
project-name: 'ci'
max-servers: 6
boot-timeout: 120
pool: public
ipv6-preferred: False
pool: 'public'
networks:
- net-id: 'LAB_43_PRIVATE_NETWORK_ID'
images:
@ -58,8 +59,3 @@ providers:
targets:
- name: sahara-gate
jenkins:
url: http://127.0.0.1/jenkins
user: admin
apikey: JENKINS_API_KEY
credentials-id: CREDENTIALS_ID

8
config/nodepool/secure.conf Normal file
View File

@ -0,0 +1,8 @@
[database]
dburi=mysql://nodepool@localhost/nodepool
[jenkins "sahara-gate"]
url=http://127.0.0.1/jenkins
user=admin
apikey=JENKINS_API_KEY
credentials=CREDENTIALS_ID

5
slave-scripts/update_config.sh
View File

@ -11,9 +11,10 @@ sudo service zuul reload
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
sed "s%apikey=JENKINS_API_KEY%apikey=$JENKINS_API_KEY%g" -i $WORKSPACE/config/nodepool/secure.conf
sed "s%credentials=CREDENTIALS_ID%credentials=$CREDENTIALS_ID%g" -i $WORKSPACE/config/nodepool/secure.conf
sudo su - nodepool -c "cat $WORKSPACE/config/nodepool/sahara.yaml > /etc/nodepool/nodepool.yaml"
sudo su - nodepool -c "cat $WORKSPACE/config/nodepool/secure.conf > /etc/nodepool/secure.conf"
sed "s%MYSQL_PASS=MYSQL_ROOT_PASSWORD%MYSQL_PASS=$MYSQL_ROOT_PASSWORD%g" -i $WORKSPACE/config/nodepool/scripts/prepare_node.sh
sed "s%JENKINS_PUBLIC_KEY%$JENKINS_PUBLIC_KEY%g" -i $WORKSPACE/config/nodepool/scripts/prepare_node.sh