diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-10-16 15:45:54 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 16:20:20 +0000 |
| commit | a5e2c3d3e54be7dbbc4f05d8443c35c0c9b57602 (patch) | |
| tree | b427487871e78cdfdf2c3cbbde7326bfbea271fb | |
| parent | abf3446f4eade931f3b98b0894028c242440ccbd (diff) | |
Return back glusterfs client state
In order to set properly keystone fernet keys, apply glusterfs client
state before second keystone server state. Also leave out user/group
settings for glusterfs volume of nova instances as it will be set later
by nova compute packages themselves.
Change-Id: I069e37c67f08c51ed29f45cf6f92d4a00a1ac97b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 0224929b3a87d0e0ec011311c46872e6142497cf)
| -rwxr-xr-x | mcp/config/states/openstack_ha | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 2e55fc890..aada4ad45 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -39,6 +39,7 @@ salt -I 'keystone:client' state.sls keystone.client salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" salt -I 'glance:server' state.sls glance -b 1 +salt -I 'glusterfs:client' state.sls glusterfs.client salt -I 'keystone:server' state.sls keystone.server salt -I 'nova:controller' state.sls nova -b 1 @@ -51,7 +52,6 @@ salt -I 'neutron:server' state.sls neutron -b 1 salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova -salt -I 'glusterfs:client' state.sls glusterfs.client salt -I 'mongodb:server' state.sls mongodb wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index 0e973d495..43b08309f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -45,8 +45,6 @@ parameters: nova_instances: path: /var/lib/nova/instances server: ${_param:glusterfs_service_host} - user: nova - group: nova # yamllint disable-line rule:line-length opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: |