# Pastebin faMz2rxO *** /home/rwellum/kolla-kubernetes/tests/bin/common_iscsi_config_v4.sh 2017-07-06 13:26:11.385816120 -0400 --- /home/rwellum/kolla-kubernetes/tests/bin/common_iscsi_config_v5.sh 2017-07-19 14:47:41.365852076 -0400 *************** *** 2,28 **** echo "global:" echo " kolla:" echo " all:" ! echo " image_tag: 4.0.0" echo " storage_provider: host" echo " install_type: source" echo " storage_provider_fstype: xfs" echo " ceph_backend: false" echo " lvm_backends:" echo " - '172.18.0.1': 'cinder-volumes'" echo " cinder:" echo " all:" ! echo " image_tag: 4.0.0" echo " volume_lvm:" echo " all:" echo " element_name: cinder-volume" echo " nova:" echo " all:" ! echo " image_tag: 4.0.0" echo " placement_api_enabled: true" echo " cell_enabled: true" echo " ironic:" echo " all:" ! echo " image_tag: 4.0.0" echo " conductor:" echo " all:" echo " ironic_api_ip: 172.21.0.10" --- 2,38 ---- echo "global:" echo " kolla:" echo " all:" ! echo " docker_registry: 127.0.0.1:30401" ! echo " docker_namespace: lokolla" ! echo " image_tag: 5.0.0" echo " storage_provider: host" echo " install_type: source" echo " storage_provider_fstype: xfs" echo " ceph_backend: false" + echo " kolla_toolbox_image_tag: 5.0.0" + echo " haproxy_image_tag: 5.0.0" + echo " fluentd_image_tag: 5.0.0" + echo " kubernetes_entrypoint_image_tag: 5.0.0" echo " lvm_backends:" echo " - '172.18.0.1': 'cinder-volumes'" echo " cinder:" echo " all:" ! echo " image_tag: 5.0.0" echo " volume_lvm:" echo " all:" echo " element_name: cinder-volume" echo " nova:" echo " all:" ! echo " image_tag: 5.0.0" echo " placement_api_enabled: true" echo " cell_enabled: true" + echo " api:" + echo " create_cell:" + echo " job:" + echo " cell_wait_compute: false" echo " ironic:" echo " all:" ! echo " image_tag: 5.0.0" echo " conductor:" echo " all:"h echo " ironic_api_ip: 172.21.0.10" *************** *** 34,38 **** echo " ironic_dhcp_range: net2,172.22.0.10,172.22.0.20,255.255.255.0" echo " horizon:" echo " all:" ! echo " image_tag: 4.0.0" } --- 44,48 ---- echo " ironic_dhcp_range: net2,172.22.0.10,172.22.0.20,255.255.255.0" echo " horizon:" echo " all:" ! echo " image_tag: 5.0.0" }