diff options
7 files changed, 19 insertions, 51 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 4bf56480..bb916fd8 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,7 +45,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index db0bd3f..9576333 100755 +index 67a7c21..2c61fab 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 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 086fa62d..ab155b52 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,7 +63,7 @@ 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 d60c81d..f31624e 100644 +index 0e3a264..82fa25f 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: 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 d9f64a1e..11bed2e5 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 @@ -10,46 +10,16 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Tue, 8 Aug 2017 03:49:53 +0200 Subject: [PATCH] network: public, mgmt: Use arm-pod3 POD config -Move MaaS IPs to x.y.z.2 (upstream Fuel uses x.y.z.3). - Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - ci/deploy.sh | 2 +- - mcp/config/states/maas | 2 +- - .../baremetal-mcp-ocata-odl-ha/infra/init.yml | 22 ++++---- + .../baremetal-mcp-ocata-odl-ha/infra/init.yml | 20 +++---- .../baremetal-mcp-ocata-odl-ha/openstack/init.yml | 62 +++++++++++----------- - .../baremetal-mcp-ocata-ovs-ha/infra/init.yml | 22 ++++---- + .../baremetal-mcp-ocata-ovs-ha/infra/init.yml | 20 +++---- .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 60 ++++++++++----------- - 6 files changed, 85 insertions(+), 85 deletions(-) - -diff --git a/ci/deploy.sh b/ci/deploy.sh -index 36056c8..a2a0c02 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -142,7 +142,7 @@ URI_REGEXP='(file|https?|ftp)://.*' - export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"} - export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100} - export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} --export MAAS_IP=${MAAS_IP:-192.168.10.3} -+export MAAS_IP=${MAAS_IP:-192.168.10.2} - export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}" - export SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}" - -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 9576333..603b530 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -57,7 +57,7 @@ salt -C 'mas01*' state.apply linux.network.interface - salt -C 'mas01*' state.apply maas.pxe_nat - salt -C 'mas01*' state.apply maas.cluster - salt -C 'cfg01*' cmd.run \ -- "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.3}" -+ "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.2}" - - wait_for 10 "salt -C 'mas01*' state.apply maas.region" + 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 f1769d7..393cbb3 100644 +index d08bdbb..b84c46c 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: @@ -58,15 +28,14 @@ index f1769d7..393cbb3 100644 # infra service addresses - infra_config_address: 10.167.4.100 + infra_config_address: 172.16.10.100 - infra_config_deploy_address: 192.168.10.100 + infra_config_deploy_address: 10.20.0.2 - infra_maas_node01_address: 10.167.4.3 -- infra_maas_node01_deploy_address: 192.168.11.3 ++ infra_maas_node01_address: 172.16.10.2 + infra_maas_node01_deploy_address: 192.168.11.3 - 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 - infra_compute_node03_address: 10.167.4.143 -+ infra_maas_node01_address: 172.16.10.2 -+ infra_maas_node01_deploy_address: 192.168.11.2 + infra_maas_node01_external_address: 10.0.8.2 + infra_compute_node01_address: 172.16.10.141 + infra_compute_node02_address: 172.16.10.142 @@ -178,7 +147,7 @@ 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 d7e365a..0b8bf2f 100644 +index b6261f6..12aa3e3 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: @@ -187,15 +156,14 @@ index d7e365a..0b8bf2f 100644 # infra service addresses - infra_config_address: 10.167.4.100 + infra_config_address: 172.16.10.100 - infra_config_deploy_address: 192.168.10.100 + infra_config_deploy_address: 10.20.0.2 - infra_maas_node01_address: 10.167.4.3 -- infra_maas_node01_deploy_address: 192.168.11.3 ++ infra_maas_node01_address: 172.16.10.2 + infra_maas_node01_deploy_address: 192.168.11.3 - 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 - infra_compute_node03_address: 10.167.4.143 -+ infra_maas_node01_address: 172.16.10.2 -+ infra_maas_node01_deploy_address: 192.168.11.2 + infra_maas_node01_external_address: 10.0.8.2 + infra_compute_node01_address: 172.16.10.141 + infra_compute_node02_address: 172.16.10.142 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 e421552c..aa5dd06c 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,7 +29,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 603b530..f6de2cb 100755 +index 2c61fab..5e2ca01 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 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 ada07668..7fb7dd56 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,7 +32,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index f6de2cb..22d83be 100755 +index 5e2ca01..8b1b32d 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 diff --git a/patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch index aa6aa5a3..f0dfece8 100644 --- a/patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ b/patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch @@ -31,7 +31,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 10 insertions(+) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index e123e52..2da13c0 100644 +index 650c63b..3438cb4 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -28,6 +28,15 @@ get_base_image() { 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 b2862992..c5509460 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 @@ -24,7 +24,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 22d83be..03d336b 100755 +index 8b1b32d..40d940d 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -80,6 +80,7 @@ salt -C 'mas01*' pillar.item\ @@ -54,7 +54,7 @@ index 0000000..4cea805 + 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 393cbb3..eb0a8bc 100644 +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 @@ @@ -64,7 +64,7 @@ index 393cbb3..eb0a8bc 100644 - 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 0b8bf2f..fb2acda 100644 +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 @@ |