Bug 2120149

Description of problem:

stackrc defines `OS_CLOUD`.
~~~
[stack@undercloud ~]$ cat stackrc 
# Clear any old environment that may conflict.
for key in $( set | awk -F= '/^OS_/ {print $1}' ); do unset "${key}" ; done
export OS_CLOUD=undercloud
# Add OS_CLOUDNAME to PS1
if [ -z "${CLOUDPROMPT_ENABLED:-}" ]; then
    export PS1=${PS1:-""}
    export PS1=\${OS_CLOUD:+"(\$OS_CLOUD)"}\ $PS1
    export CLOUDPROMPT_ENABLED=1
fi
~~~

On the otherhand, overcloudrc defines `OS_CLOUDNAME`
~~~
 [stack@undercloud ~]$ cat overcloudrc
# Clear any old environment that may conflict.
for key in $( set | awk '{FS="="}  /^OS_/ {print $1}' ); do unset $key ; done
  :
export OS_CLOUDNAME=overcloud
  :

# Add OS_CLOUDNAME to PS1
if [ -z "${CLOUDPROMPT_ENABLED:-}" ]; then
    export PS1=${PS1:-""}
    export PS1=\${OS_CLOUDNAME:+"(\$OS_CLOUDNAME)"}\ $PS1
    export CLOUDPROMPT_ENABLED=1
fi
~~~

This difference causes lack of bash prompt display as below.

< soruce stackrc ==> overcloudrc >
~~~
[stack@undercloud ~]$ source stackrc
(undercloud) [stack@undercloud ~]$ source overcloudrc
 [stack@undercloud ~]$ 
~~~

< source overcloudrc ==> stackrc>
~~~
[stack@undercloud ~]$ source overcloudrc
(overcloud) [stack@undercloud ~]$ source stackrc 
 [stack@undercloud ~]$ 
~~~

I think both should be "OS_CLOUDNAME", not "OS_CLOUD", because we used "OS_CLOUDNAME" in RHOSP 16.



Version-Release number of selected component (if applicable):
RHOSP 17.0 beta


How reproducible:
Install undercloud and then deploy overcloud.


Actual results:
stackrc defines OS_CLOUD, but overcloudrc defines OS_CLOUDNAME.


Expected results:
Both stackrc and overcloudrc define OS_CLOUDNAME.