Merge "Deployed server bootstrap via Heat"

changes/97/403397/18
Jenkins 6 years ago committed by Gerrit Code Review
commit e4d2899627
  1. 16
      deployed-server/deployed-server-bootstrap-centos.sh
  2. 22
      deployed-server/deployed-server-bootstrap-centos.yaml
  3. 5
      deployed-server/deployed-server.yaml
  4. 7
      environments/deployed-server-bootstrap-environment-centos.yaml
  5. 1
      environments/deployed-server-environment.yaml

@ -0,0 +1,16 @@
#!/bin/bash
set -eux
yum install -y \
jq \
python-ipaddr \
openstack-puppet-modules \
os-net-config \
openvswitch \
python-heat-agent*
ln -s -f /usr/share/openstack-puppet/modules/* /etc/puppet/modules
setenforce 0
sed -i 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config

@ -0,0 +1,22 @@
heat_template_version: 2014-10-16
description: 'Deployed Server Bootstrap Config'
parameters:
server:
type: string
resources:
DeployedServerBootstrapConfig:
type: OS::Heat::SoftwareConfig
properties:
group: script
config: {get_file: deployed-server-bootstrap-centos.sh}
DeployedServerBootstrapDeployment:
type: OS::Heat::SoftwareDeployment
properties:
config: {get_resource: DeployedServerBootstrapConfig}
server: {get_param: server}

@ -106,6 +106,11 @@ resources:
config: {get_resource: HostsEntryConfig}
server: {get_resource: deployed-server}
DeployedServerBootstrapConfig:
type: OS::TripleO::DeployedServer::Bootstrap
properties:
server: {get_resource: deployed-server}
ControlPlanePort:
type: OS::TripleO::DeployedServer::ControlPlanePort
properties:

@ -0,0 +1,7 @@
# An environment that can be used with the deployed-server.yaml template to do
# initial bootstrapping of the deployed servers.
resource_registry:
OS::TripleO::DeployedServer::Bootstrap: ../deployed-server/deployed-server-bootstrap-centos.yaml
parameter_defaults:
EnablePackageInstall: True

@ -1,3 +1,4 @@
resource_registry:
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port
OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None

Loading…
Cancel
Save