Update the list of patchsets for ccp-neutron

examples/kubernetes/ccp/run_demo.sh

@@ -18,10 +18,6 @@ nova flavor-create demo --is-public true auto 128 2 1
 curl -O http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img
 glance image-create --name cirros --disk-format qcow2 --container-format bare --file cirros-0.3.4-x86_64-disk.img
 
-# Network
-neutron net-create net1 --provider:network-type vxlan
-neutron subnet-create net1 172.20.0.0/24 --name subnet1
-
 # Aggregates
 node2=`openstack hypervisor list | grep -o '[a-z]\+-k8s-02'`
 node3=`openstack hypervisor list | grep -o '[a-z]\+-k8s-03'`
@@ -30,6 +26,10 @@ nova aggregate-add-host n2 $node2
 nova aggregate-create n3 n3
 nova aggregate-add-host n3 $node3
 
+# Network
+neutron net-create net1 --provider:network-type vxlan
+neutron subnet-create net1 172.20.0.0/24 --name subnet1
+
 # Instances
 net_id=`neutron net-list | grep net1 | awk '{print $2}'`
 nova boot ti02 --image cirros --flavor demo --nic net-id=$net_id --key-name test --availability-zone n2

playbooks/ccp-build.yaml

@@ -55,8 +55,7 @@
         chdir: /root/microservices-repos/fuel-ccp-neutron
       shell: git fetch https://git.openstack.org/openstack/fuel-ccp-neutron {{ item }} && git cherry-pick FETCH_HEAD
       with_items:
-        - "refs/changes/96/340496/4"
-        - "refs/changes/42/340942/2"
+        - "refs/changes/96/340496/6"
 
     - name: Build CCP images
       shell: mcp-microservices --config-file=/root/ccp/ccp.conf build