summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO1
-rw-r--r--prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml11
-rwxr-xr-xutils/jenkins-jnlp-connect.sh1
3 files changed, 10 insertions, 3 deletions
diff --git a/INFO b/INFO
index b723fa8c8..466afb8b8 100644
--- a/INFO
+++ b/INFO
@@ -20,6 +20,7 @@ Jose Lausuch (Ericsson, jose.lausuch@ericsson.com)
Ryota Mibu (NEC, r-mibu@cq.jp.nec.com)
Mei Mei (Huawei, meimei@huawei.com)
Trevor Bramwell (Linux Foundation, tbramwell@linuxfoundation.org)
+Serena Feng (ZTE, feng.xiaowei@zte.com.cn)
Link to TSC approval of the project: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html
Link to TSC voting for removal of Victor Laza as committer: http://meetbot.opnfv.org/meetings/opnfv-meeting/2016/opnfv-meeting.2016-02-16-14.59.html
diff --git a/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml b/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml
index b4dffdccf..d650f1056 100644
--- a/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml
+++ b/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml
@@ -67,13 +67,18 @@
- role: ironic-enroll-dynamic
- { role: ironic-inspect-node, when: inspect_nodes | default('false') | bool == true }
- hosts: baremetal
+ name: "Create configuration drive files"
+ become: no
+ connection: local
+ roles:
+ - role: bifrost-configdrives-dynamic
+- hosts: baremetal
vars:
multinode_testing: "{{ inventory_dhcp | bool == true }}"
- name: "Create configuration drive files and deploy machines."
+ name: "Deploy machines."
become: no
connection: local
+ serial: 1
roles:
- - role: bifrost-configdrives-dynamic
- role: bifrost-deploy-nodes-dynamic
- role: bifrost-prepare-for-test-dynamic
- serial: 1
diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh
index 4b710cab2..9ef4298ef 100755
--- a/utils/jenkins-jnlp-connect.sh
+++ b/utils/jenkins-jnlp-connect.sh
@@ -151,6 +151,7 @@ fi
usage() {
cat << EOF
+**this file must be copied to the jenkins home directory to work**
jenkins-jnlp-connect.sh configures monit to keep slave connection up
Checks for new versions of slave.jar
run as root to create pid directory and create monit config.