Merge "bifrost: Serialize localhost actions during final host deployment"

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index b117b32..17796a8 100644 (file)
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -173,4 +173,6 @@
                 file-paths:
                   - compare-type: ANT
                     pattern: 'prototypes/bifrost/**'
+                  - compare-type: ANT
+                    pattern: 'jjb/infra/**'
             readable-message: true

diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh
index 759b50b..f7920a3 100755 (executable)
--- a/jjb/infra/bifrost-verify.sh
+++ b/jjb/infra/bifrost-verify.sh
@@ -18,6 +18,7 @@ function fix_ownership() {
         echo "Not running as part of Jenkins. Handle the logs manually."
     else
         sudo chown -R jenkins:jenkins $WORKSPACE
+        sudo chown -R jenkins:jenkins ${HOME}/.cache
     fi
 }
 
@@ -30,6 +31,9 @@ fi
 # remove previously cloned repos
 sudo /bin/rm -rf /opt/bifrost /opt/puppet-infracloud /opt/stack /opt/releng
 
+# Fix up permissions
+fix_ownership
+
 # clone all the repos first and checkout the patch afterwards
 sudo git clone https://git.openstack.org/openstack/bifrost /opt/bifrost
 sudo git clone https://git.openstack.org/openstack-infra/puppet-infracloud /opt/puppet-infracloud

diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index f56de7f..e637f7b 100644 (file)
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -67,22 +67,9 @@ fi
 
 
 # cd to directory where Dockerfile is located
-if [[ "$DOCKER_REPO_NAME" == "opnfv/bottlenecks" ]]; then
-    cd $WORKSPACE/ci/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/cperf" ]]; then
-    cd $WORKSPACE/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/dovetail" ]]; then
-    cd $WORKSPACE/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then
-    cd $WORKSPACE/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/qtip" ]]; then
-    cd $WORKSPACE/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/storperf" ]]; then
-    cd $WORKSPACE/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/yardstick" ]]; then
-    cd $WORKSPACE/tests/ci/docker/yardstick-ci
-else
-    echo "ERROR: DOCKER_REPO_NAME parameter not valid: $DOCKER_REPO_NAME"
+cd $WORKSPACE/docker
+if [ ! -f ./Dockerfile ]; then
+    echo "ERROR: Dockerfile not found."
     exit 1
 fi
 

diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml
index 9357b64..5a758af 100644 (file)
--- a/prototypes/puppet-infracloud/hiera/common.yaml
+++ b/prototypes/puppet-infracloud/hiera/common.yaml
@@ -112,6 +112,7 @@ bifrost_ssh_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/CvYtt8lC4pkM5Cx7
 infracloud_vlan: 415
 infracloud_gateway_ip: 172.30.13.1
 default_network_interface: eno3
+dhcp_static_mask: 255.255.255.128
 dchp_pool_start: 10.20.0.130
 dhcp_pool_end: 10.20.0.254
 network_interface: eno1

diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index ae229d8..70901e6 100644 (file)
--- a/prototypes/puppet-infracloud/manifests/site.pp
+++ b/prototypes/puppet-infracloud/manifests/site.pp
@@ -91,10 +91,12 @@ node 'baremetal.opnfvlocal', 'lfpod5-jumpserver' {
     vlan                      => hiera('infracloud_vlan'),
     gateway_ip                => hiera('infracloud_gateway_ip'),
     default_network_interface => hiera('default_network_interface'),
+    dhcp_static_mask          => hiera('dhcp_static_mask'),
     dhcp_pool_start           => hiera('dhcp_pool_start'),
     dhcp_pool_end             => hiera('dhcp_pool_end'),
     network_interface         => hiera('network_interface'),
     ipv4_nameserver           => hiera('ipv4_nameserver'),
     ipv4_subnet_mask          => hiera('ipv4_subnet_mask'),
+    bridge_name               => hiera('bridge_name'),
   }
 }