diff options
9 files changed, 184 insertions, 11 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index fec958ba..0cdbef13 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -73,6 +73,7 @@ parameter_defaults: - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentIpmi - OS::TripleO::Services::CeilometerAgentNotification + - OS::TripleO::Services::ComputeCeilometerAgent - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd - OS::TripleO::Services::GnocchiStatsd diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml index 54eef744..bab08a30 100644 --- a/ci/environments/scenario001-multinode.yaml +++ b/ci/environments/scenario001-multinode.yaml @@ -70,6 +70,7 @@ parameter_defaults: - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentIpmi - OS::TripleO::Services::CeilometerAgentNotification + - OS::TripleO::Services::ComputeCeilometerAgent - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd - OS::TripleO::Services::GnocchiStatsd diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index 584c1e5e..43acf6dc 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -6,12 +6,8 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - # TODO: Barbican is not yet containerized: https://review.openstack.org/#/c/474327 - # OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml - OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml - # TODO: Zaqar doesn't work when containerized - # https://bugs.launchpad.net/tripleo/+bug/1710959 - OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml + OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml + OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml # NOTE: This is needed because of upgrades from Ocata to Pike. We # deploy the initial environment with Ocata templates, and diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml new file mode 100644 index 00000000..b1bf7da8 --- /dev/null +++ b/docker/services/barbican-api.yaml @@ -0,0 +1,154 @@ +heat_template_version: pike + +description: > + OpenStack containerized Barbican API service + +parameters: + DockerBarbicanApiImage: + description: image + type: string + DockerBarbicanConfigImage: + description: The container image to use for the barbican config_volume + type: string + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + ServiceData: + default: {} + description: Dictionary packing service data + type: json + ServiceNetMap: + default: {} + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. This + mapping overrides those in ServiceNetMapDefaults. + type: json + DefaultPasswords: + default: {} + type: json + RoleName: + default: '' + description: Role name on which the service is applied + type: string + RoleParameters: + default: {} + description: Parameters specific to the role + type: json + EnableInternalTLS: + type: boolean + default: false + +conditions: + + internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} + +resources: + + ContainersCommon: + type: ./containers-common.yaml + + MySQLClient: + type: ../../puppet/services/database/mysql-client.yaml + + BarbicanApiBase: + type: ../../puppet/services/barbican-api.yaml + properties: + EndpointMap: {get_param: EndpointMap} + ServiceData: {get_param: ServiceData} + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + RoleName: {get_param: RoleName} + RoleParameters: {get_param: RoleParameters} + +outputs: + role_data: + description: Role data for the Barbican API role. + value: + service_name: {get_attr: [BarbicanApiBase, role_data, service_name]} + config_settings: + map_merge: + - get_attr: [BarbicanApiBase, role_data, config_settings] + - apache::default_vhost: false + step_config: &step_config + list_join: + - "\n" + - - {get_attr: [BarbicanApiBase, role_data, step_config]} + - {get_attr: [MySQLClient, role_data, step_config]} + service_config_settings: {get_attr: [BarbicanApiBase, role_data, service_config_settings]} + # BEGIN DOCKER SETTINGS + puppet_config: + config_volume: barbican + puppet_tags: barbican_api_paste_ini,barbican_config + step_config: *step_config + config_image: {get_param: DockerBarbicanConfigImage} + kolla_config: + /var/lib/kolla/config_files/barbican_api.json: + command: /usr/sbin/httpd -DFOREGROUND + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true + docker_config: + # db sync runs before permissions set by kolla_config + step_2: + barbican_init_logs: + image: &barbican_api_image {get_param: DockerBarbicanApiImage} + privileged: false + user: root + volumes: + - /var/log/containers/barbican:/var/log/barbican + command: ['/bin/bash', '-c', 'chown -R barbican:barbican /var/log/barbican'] + step_3: + barbican_api_db_sync: + start_order: 0 + image: *barbican_api_image + net: host + detach: false + user: root + volumes: &barbican_api_volumes + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/config-data/barbican/etc/barbican/:/etc/barbican/:ro + - /var/log/containers/barbican:/var/log/barbican + command: "/usr/bin/bootstrap_host_exec barbican_api su barbican -s /bin/bash -c '/usr/bin/barbican-manage db upgrade'" + step_4: + barbican_api: + image: *barbican_api_image + net: host + privileged: false + restart: always + user: root + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/kolla/config_files/barbican_api.json:/var/lib/kolla/config_files/config.json:ro + - /var/log/containers/barbican:/var/log/barbican + - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro + - + if: + - internal_tls_enabled + - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - '' + - + if: + - internal_tls_enabled + - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - '' + environment: + - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + host_prep_tasks: + - name: create persistent logs directory + file: + path: /var/log/containers/barbican + state: directory + upgrade_tasks: + - name: Stop and disable barbican_api service + tags: step2 + service: name=openstack-barbican-api state=stopped enabled=no + metadata_settings: + get_attr: [BarbicanApiBase, role_data, metadata_settings]
\ No newline at end of file diff --git a/network/scripts/run-os-net-config.sh b/network/scripts/run-os-net-config.sh index 864da24b..d121fcf1 100755 --- a/network/scripts/run-os-net-config.sh +++ b/network/scripts/run-os-net-config.sh @@ -75,12 +75,13 @@ EOF_CAT if [ "$mac_addr_type" != "0" ]; then echo "Device has generated MAC, skipping." else - ip link set dev $iface up &>/dev/null - HAS_LINK="$(cat /sys/class/net/${iface}/carrier)" + HAS_LINK="$(cat /sys/class/net/${iface}/carrier || echo 0)" TRIES=10 while [ "$HAS_LINK" == "0" -a $TRIES -gt 0 ]; do - HAS_LINK="$(cat /sys/class/net/${iface}/carrier)" + # Need to set the link up on each iteration + ip link set dev $iface up &>/dev/null + HAS_LINK="$(cat /sys/class/net/${iface}/carrier || echo 0)" if [ "$HAS_LINK" == "1" ]; then break else diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 5cc020a9..cdba2d3f 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -47,7 +47,7 @@ parameters: description: Whether to manage event_pipeline.yaml. type: boolean EventPipelinePublishers: - default: ['gnocchi://'] + default: ['gnocchi://', 'panko://'] description: > A list of publishers to put in event_pipeline.yaml. When the collector is used, override this with notifier:// publisher. @@ -115,6 +115,10 @@ parameters: description: Driver or drivers to handle sending notifications. constraints: - allowed_values: [ 'messagingv2', 'noop' ] + GnocchiArchivePolicy: + default: 'low' + type: string + description: archive policy to use with gnocchi backend conditions: service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']} @@ -149,7 +153,7 @@ outputs: ceilometer::agent::auth::auth_endpoint_type: 'internalURL' ceilometer::dispatcher::gnocchi::url: {get_param: [EndpointMap, GnocchiInternal, uri]} ceilometer::dispatcher::gnocchi::filter_project: 'service' - ceilometer::dispatcher::gnocchi::archive_policy: 'low' + ceilometer::dispatcher::gnocchi::archive_policy: {get_param: GnocchiArchivePolicy} ceilometer::dispatcher::gnocchi::resources_definition_file: 'gnocchi_resources.yaml' ceilometer::notification_driver: {get_param: NotificationDriver} ceilometer::rabbit_userid: {get_param: RabbitUserName} diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml index 61bf4580..8a282014 100644 --- a/puppet/services/pacemaker/manila-share.yaml +++ b/puppet/services/pacemaker/manila-share.yaml @@ -52,5 +52,8 @@ outputs: config_settings: map_merge: - get_attr: [ManilaShareBase, role_data, config_settings] + - manila::share::manage_service: false + manila::share::enabled: false + manila::host: hostgroup step_config: | include ::tripleo::profile::pacemaker::manila diff --git a/releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml b/releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml new file mode 100644 index 00000000..ff0904b8 --- /dev/null +++ b/releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - Set "host" parameter in manila.conf to 'hostgroup' when running + manila share service under pacemaker. This labels instances of + the service on different nodes with the same "host" as cinder does + in this circumstance so that the instances are considered by + OpenStack to provide the same service and manila share is able to + maintain management of shares on the backend after failover and + failback. diff --git a/releasenotes/notes/containarise-barbican-1253606411d497ff.yaml b/releasenotes/notes/containarise-barbican-1253606411d497ff.yaml new file mode 100644 index 00000000..85292231 --- /dev/null +++ b/releasenotes/notes/containarise-barbican-1253606411d497ff.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Barbican API added to containarised overcloud deployment |