diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-02-05 11:26:27 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-02-07 09:53:06 -0500 |
| commit | 50f1d92e0aa0e5720adc44f23ed59a4cfc1c4b58 (patch) | |
| tree | e2e7ce20587ac56c48b5033101d7d008621d9fb2 | |
| parent | e1eda223437eed7bef2bdfa7bef990a6749f1670 (diff) | |
Fixes missing CephClientKey generation
In newer OOO deployments, the keys for ceph are dynamically generated.
Also removes tacker client patch for symmetrical as it is already
present in stable/pike:
https://github.com/openstack/python-tackerclient/commit/682c9651085214a58434ad6016d93b2cdc8f3462
JIRA: APEX-563
Change-Id: I01fb617b026bae5d6e265a4afbac270939627c5a
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | apex/overcloud/deploy.py | 3 | ||||
| -rw-r--r-- | build/patches/tacker-client-fix-symmetrical.patch | 31 | ||||
| -rwxr-xr-x | build/undercloud.sh | 2 |
3 files changed, 3 insertions, 33 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index d1099c41..f988cf3d 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -542,6 +542,9 @@ def prep_storage_env(ds, tmp_dir): elif 'CephAdminKey' in line: print(" CephAdminKey: {}".format(generate_ceph_key().decode( 'utf-8'))) + elif 'CephClientKey' in line: + print(" CephClientKey: {}".format(generate_ceph_key().decode( + 'utf-8'))) else: print(line) if 'ceph_device' in ds_opts and ds_opts['ceph_device']: diff --git a/build/patches/tacker-client-fix-symmetrical.patch b/build/patches/tacker-client-fix-symmetrical.patch deleted file mode 100644 index eab01a62..00000000 --- a/build/patches/tacker-client-fix-symmetrical.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9630f711a88a69480c44d6ac21244d9a8b0d92c7 Mon Sep 17 00:00:00 2001 -From: Tim Rozet <trozet@redhat.com> -Date: Fri, 18 Aug 2017 16:22:23 -0400 -Subject: [PATCH] Fixes passing boolean as string for symmetrical - -Bug where 'True'/'False' strings were being passed in REST to Tacker -service which would end up throwing an exception because the DB type for -symmetrical is boolean/small int. This converts it to boolean in the -client. - -Closes-Bug: 1711550 - -Change-Id: Ide2aeab73b1dd88beb6e491e6b07cdee9fb7e48a -Signed-off-by: Tim Rozet <trozet@redhat.com> ---- - -diff --git a/tackerclient/tacker/v1_0/nfvo/vnffg.py b/tackerclient/tacker/v1_0/nfvo/vnffg.py -index 729cd19..92b98ed 100644 ---- a/tackerclient/tacker/v1_0/nfvo/vnffg.py -+++ b/tackerclient/tacker/v1_0/nfvo/vnffg.py -@@ -97,7 +97,9 @@ - help=_('List of logical VNFD name to VNF instance name mapping. ' - 'Example: VNF1:my_vnf1,VNF2:my_vnf2')) - parser.add_argument( -- '--symmetrical', metavar='{True,False}', -+ '--symmetrical', -+ action='store_true', -+ default=False, - help=_('Should a reverse path be created for the NFP')) - parser.add_argument( - '--param-file', diff --git a/build/undercloud.sh b/build/undercloud.sh index 0cfb6737..6bb8ac90 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -59,8 +59,6 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ --upload ${CACHE_DIR}/${calipso_script}:/root/ \ --install "libguestfs-tools" \ --install "python-tackerclient" \ - --upload ${BUILD_ROOT}/patches/tacker-client-fix-symmetrical.patch:/usr/lib/python2.7/site-packages/ \ - --run-command "cd usr/lib/python2.7/site-packages/ && patch -p1 < tacker-client-fix-symmetrical.patch" \ --run-command "yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo" \ --install yum-utils,lvm2,device-mapper-persistent-data \ -a undercloud_build.qcow2 |