From d0d38b28fa302f8c9dbd18a16e4102787c528547 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 12 Sep 2017 19:55:00 +0200 Subject: u/fuel: Bump & rebase for runtime parametrization While at it, move opnfv user required reclass parameters to newly added . Change-Id: Ic614e9e9db4e3ae74b8c08bc34be5fc732c2aae4 Signed-off-by: Alexandru Avadanii --- ...-salt-formulas-Add-enable-armband-formula.patch | 4 +- ...etwork-public-Use-arm-virtual2-POD-config.patch | 4 +- ...s-baremetal-AArch64-virtio-NIC-names-sync.patch | 6 +-- ...twork-public-mgmt-Use-arm-pod3-POD-config.patch | 16 +++---- ...lasses-baremetal-arm-pod3-config-hardcode.patch | 4 +- ...lt-formulas-armband-Extend-libvirt_domain.patch | 4 +- ...p-salt-formulas-armband-AArch64-bootstrap.patch | 4 +- .../0017-Add-opnfv-user-to-the-deployment.patch | 50 ++++++---------------- upstream/fuel | 2 +- 9 files changed, 36 insertions(+), 58 deletions(-) diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index bb916fd8..3cab8768 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -45,10 +45,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 67a7c21..2c61fab 100755 +index 0d733ba..bfedbae 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -86,6 +86,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected +@@ -85,6 +85,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch index ab155b52..78b0524e 100644 --- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch @@ -63,10 +63,10 @@ index 505153a..bd6e923 100755 + --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \ --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -index 0e3a264..82fa25f 100644 +index 73e2da5..47bf28d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -@@ -53,13 +53,13 @@ parameters: +@@ -52,13 +52,13 @@ parameters: params: single_address: 172.16.10.105 tenant_address: 10.1.0.105 diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index 2f256992..96e58139 100644 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -125,7 +125,7 @@ index 41366f3..766a495 100644 - - ${_param:deploy_nic}.300 + - ${_param:trunk_nic}.2183 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -index c4bc929..5649990 100644 +index 72b9f52..08a3b48 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -4,10 +4,10 @@ classes: @@ -309,7 +309,7 @@ index f5312c1..d2e6a40 100644 + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml -index 4aa7bb0..118d22d 100644 +index 89a1930..6e542b0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml @@ -17,7 +17,7 @@ classes: @@ -430,7 +430,7 @@ index 5c8026f..ca1b44b 100644 - - ${_param:deploy_nic}.300 + - ${_param:trunk_nic}.2183 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -index d193469..73215ee 100644 +index f77abea..37e8377 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml @@ -4,10 +4,10 @@ classes: diff --git a/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch index 11bed2e5..020fcaaa 100644 --- a/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -19,10 +19,10 @@ Signed-off-by: Alexandru Avadanii 4 files changed, 81 insertions(+), 81 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -index d08bdbb..b84c46c 100644 +index 730193a..af3daf5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -@@ -16,19 +16,19 @@ parameters: +@@ -17,19 +17,19 @@ parameters: infra_maas_database_password: opnfv_secret # infra service addresses @@ -30,8 +30,8 @@ index d08bdbb..b84c46c 100644 + infra_config_address: 172.16.10.100 infra_config_deploy_address: 10.20.0.2 - infra_maas_node01_address: 10.167.4.3 -+ infra_maas_node01_address: 172.16.10.2 - infra_maas_node01_deploy_address: 192.168.11.3 ++ infra_maas_node01_address: 172.16.10.3 + infra_maas_node01_deploy_address: ${_param:opnfv_fuel_maas_pxe_address} - infra_maas_node01_external_address: 10.16.0.3 - infra_compute_node01_address: 10.167.4.141 - infra_compute_node02_address: 10.167.4.142 @@ -147,10 +147,10 @@ index e49a205..ad99447 100644 opendaylight_server_node01_hostname: odl01 opendaylight_router: odl-router_v2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -index b6261f6..12aa3e3 100644 +index 6bf0fbe..9df480f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -@@ -16,19 +16,19 @@ parameters: +@@ -17,19 +17,19 @@ parameters: infra_maas_database_password: opnfv_secret # infra service addresses @@ -158,8 +158,8 @@ index b6261f6..12aa3e3 100644 + infra_config_address: 172.16.10.100 infra_config_deploy_address: 10.20.0.2 - infra_maas_node01_address: 10.167.4.3 -+ infra_maas_node01_address: 172.16.10.2 - infra_maas_node01_deploy_address: 192.168.11.3 ++ infra_maas_node01_address: 172.16.10.3 + infra_maas_node01_deploy_address: ${_param:opnfv_fuel_maas_pxe_address} - infra_maas_node01_external_address: 10.16.0.3 - infra_compute_node01_address: 10.167.4.141 - infra_compute_node02_address: 10.167.4.142 diff --git a/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch index 56de318c..ac3d1356 100644 --- a/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch +++ b/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch @@ -21,7 +21,7 @@ Signed-off-by: Alexandru Avadanii 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -index 5649990..e4765ca 100644 +index 08a3b48..3568c78 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -48,57 +48,57 @@ parameters: @@ -103,7 +103,7 @@ index 5649990..e4765ca 100644 hwe_kernel: hwe-16.04 linux: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -index 73215ee..26115fe 100644 +index 37e8377..d71b3a6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml @@ -48,57 +48,57 @@ parameters: diff --git a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index aa5dd06c..15820d2b 100644 --- a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -29,10 +29,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 2c61fab..5e2ca01 100755 +index bfedbae..6beef6f 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -86,7 +86,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected +@@ -85,7 +85,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp diff --git a/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch index 7fb7dd56..ed6bf133 100644 --- a/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch +++ b/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch @@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 5e2ca01..8b1b32d 100755 +index 6beef6f..3aafaf5 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -81,6 +81,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all +@@ -80,6 +80,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network diff --git a/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch index c5509460..4411df27 100644 --- a/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch @@ -14,20 +14,17 @@ Signed-off-by: Alexandru Avadanii Signed-off-by: Charalampos Kominos Signed-off-by: Guillermo Herrero --- - mcp/config/states/maas | 2 ++ - mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml | 4 ++++ - .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 1 + - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 1 + - mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ - 5 files changed, 15 insertions(+) - create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml + mcp/config/states/maas | 2 ++ + mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml | 4 ++++ + mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ + 3 files changed, 13 insertions(+) create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 8b1b32d..40d940d 100755 +index 3aafaf5..546a53f 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -80,6 +80,7 @@ salt -C 'mas01*' pillar.item\ +@@ -79,6 +79,7 @@ salt -C 'mas01*' pillar.item\ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all salt -C 'kvm*' pkg.install bridge-utils @@ -35,7 +32,7 @@ index 8b1b32d..40d940d 100755 salt -C 'kvm*' state.apply linux.network salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot -@@ -103,6 +104,7 @@ while [ $rc -ne 0 ]; do +@@ -102,6 +103,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; @@ -43,36 +40,17 @@ index 8b1b32d..40d940d 100755 done sleep 5 done -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml -new file mode 100644 -index 0000000..4cea805 ---- /dev/null -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml -@@ -0,0 +1,4 @@ +diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +index 28619ba..fd96969 100644 +--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml ++++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +@@ -1,2 +1,6 @@ + classes: + - cluster.all-mcp-ocata-common.opnfv.runtime +parameters: + _param: + opnfv_user_username: opnfv + opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1 -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -index b84c46c..7ad4db5 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -@@ -1,4 +1,5 @@ - classes: -+- cluster.baremetal-mcp-ocata-common.opnfv - - system.linux.system.single - - cluster.baremetal-mcp-ocata-odl-ha.openstack - # - cluster.baremetal-mcp-ocata-odl-ha.stacklight -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -index 12aa3e3..1277adf 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -@@ -1,4 +1,5 @@ - classes: -+- cluster.baremetal-mcp-ocata-common.opnfv - - system.linux.system.single - - cluster.baremetal-mcp-ocata-ovs-ha.openstack - # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls new file mode 100644 index 0000000..78ef993 diff --git a/upstream/fuel b/upstream/fuel index a760c973..b30697a8 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit a760c973e420371b07ac1739ba2d32a1df87226f +Subproject commit b30697a84ce41ee20a8b6070acda60f3a5cfac26 -- cgit 1.2.3-korg