SM GUI: storage_monitor_secret setting does not populate in hieradata

[wenqing liang]

r3.0.2.0-51 kilo.

storage monitor secret was set in storage config page of sm gui. it is also seen in cluster detail. However, it is not in hieradata:

root@a5d01e08-2:~/store# server-manager show cluster --detail --cluster_id wql-ceph3-cluster | grep monitor
                "storage_monitor_secret": "AQBM78tTEMz+GhAA3WiOXQI7UVdIy0YFFuTGdw==",
root@a5d01e08-2:~/store#

root@a5d01e08-2:/etc/puppet/environments/contrail_test_pkg/hieradata# grep monitor * | grep a5d01e05
a5d01e05.englab.juniper.net-contrail.yaml:'contrail::params::storage_monitor_hosts':
a5d01e05.englab.juniper.net-contrail.yaml:'contrail::params::storage_monitor_secret': ''
root@a5d01e08-2:/etc/puppet/environments/contrail_test_pkg/hieradata#

provision thus hangs at 'steps': [[(u'a5d01e05', 'post_provision')

Jun 10 09:50:14 a5d01e05 puppet-agent[25586]: Could not retrieve catalog from remote server: Error 400 on SERVER: authentication_type cephx requires either key or keyring to be set but both are undef at /etc/puppet/environments/contrail_test_pkg/modules/ceph/manifests/mon.pp:99 on node a5d01e05.englab.juniper.net
Jun 10 09:50:14 a5d01e05 puppet-agent[25586]: Not using cache on failed catalog
Jun 10 09:50:14 a5d01e05 puppet-agent[25586]: Could not retrieve catalog; skipping run
Jun 10 09:50:15 a5d01e05 puppet-agent[26538]: Local environment: "production" doesn't match server specified node environment "contrail_test_pkg", switching agent to "contrail_test_pkg".
Jun 10 09:50:26 a5d01e05 puppet-agent[26538]: Could not retrieve catalog from remote server: Error 400 on SERVER: authentication_type cephx requires either key or keyring to be set but both are undef at /etc/puppet/environments/contrail_test_pkg/modules/ceph/manifests/mon.pp:99 on node a5d01e05.englab.juniper.net
Jun 10 09:50:26 a5d01e05 puppet-agent[26538]: Not using cache on failed catalog
Jun 10 09:50:26 a5d01e05 puppet-agent[26538]: Could not retrieve catalog; skipping run
Jun 10 09:50:27 a5d01e05 puppet-agent[27476]: Local environment: "production" doesn't match server specified node environment "contrail_test_pkg", switching agent to "contrail_test_pkg".
Jun 10 09:50:38 a5d01e05 puppet-agent[27476]: Could not retrieve catalog from remote server: Error 400 on SERVER: authentication_type cephx requires either key or keyring to be set but both are undef at /etc/puppet/environments/contrail_test_pkg/modules/ceph/manifests/mon.pp:99 on node a5d01e05.englab.juniper.net
Jun 10 09:50:38 a5d01e05 puppet-agent[27476]: Not using cache on failed catalog
Jun 10 09:50:38 a5d01e05 puppet-agent[27476]: Could not retrieve catalog; skipping run
Jun 10 09:50:39 a5d01e05 puppet-agent[28447]: Local environment: "production" doesn't match server specified node environment "contrail_test_pkg", switching agent to "contrail_test_pkg".

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/23176
Submitter: Nitish Krishna Kaveri (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/23178
Submitter: Nitish Krishna Kaveri (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/23178
Committed: http://github.org/Juniper/contrail-server-manager/commit/51083e41ef10f92c14b8a501c62862219d7ba9ee
Submitter: Zuul
Branch: master

commit 51083e41ef10f92c14b8a501c62862219d7ba9ee
Author: nitishkrishna <email address hidden>
Date: Wed Aug 10 11:39:27 2016 -0700

Closes-Bug: #1611885 - SM Lite doesn't translate storage server params in new format

The storage_repo_id, storage_osd_disks params are coming in old format

Closes-Bug: #1591453 - SM Lite doesn't correctly pass on osd_bootstrap_key, storage_admin_key and storage_monitor_secret

These params were explicitly being set in cluster params from ini file. They need to be put into testbed.py as below:

storage_monitor_secret = <Ceph format key>
osd_bootstrap_key = <Ceph format key>
storage_admin_key = <Ceph format key>

Also some params for storage which could have been over-ridden by user have been removed from testbed to json conversion:
storage_num_osd
storage_fsid
storage_num_hosts
storage_virsh_uuid
storage_cluster_network

Patch 2:
Added default values for the Ceph keys in contrail-defaults.yaml

Change-Id: Ibc20e5e2428205f8c6199f4ee2610a57ec92d7bb

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/23176
Committed: http://github.org/Juniper/contrail-server-manager/commit/2648f9dd945674f07233cb98e03c4316662bd033
Submitter: Zuul
Branch: R3.1

commit 2648f9dd945674f07233cb98e03c4316662bd033
Author: nitishkrishna <email address hidden>
Date: Wed Aug 10 11:39:27 2016 -0700

Closes-Bug: #1611885 - SM Lite doesn't translate storage server params in new format

The storage_repo_id, storage_osd_disks params are coming in old format

Closes-Bug: #1591453 - SM Lite doesn't correctly pass on osd_bootstrap_key, storage_admin_key and storage_monitor_secret

These params were explicitly being set in cluster params from ini file. They need to be put into testbed.py as below:

storage_monitor_secret = <Ceph format key>
osd_bootstrap_key = <Ceph format key>
storage_admin_key = <Ceph format key>

Also some params for storage which could have been over-ridden by user have been removed from testbed to json conversion:
storage_num_osd
storage_fsid
storage_num_hosts
storage_virsh_uuid
storage_cluster_network

Patch 2:
Added default values for the Ceph keys in contrail-defaults.yaml

Change-Id: Ibc20e5e2428205f8c6199f4ee2610a57ec92d7bb