Merge "Adds service for managing securetty"

diff --git a/deployed-server/scripts/get-occ-config.sh b/deployed-server/scripts/get-occ-config.sh
index d0cc4df..28f038c 100755 (executable)
--- a/deployed-server/scripts/get-occ-config.sh
+++ b/deployed-server/scripts/get-occ-config.sh
@@ -89,16 +89,16 @@ for role in $OVERCLOUD_ROLES; do
         done
 
         echo "======================"
-        echo "$role$i os-collect-config.conf configuration:"
+        echo "$role$i deployed-server.json configuration:"
 
-        config="
-[DEFAULT]
-collectors=request
-command=os-refresh-config
-polling_interval=30
-
-[request]
-metadata_url=$deployed_server_metadata_url"
+        config="{
+  \"os-collect-config\": {
+    \"collectors\": [\"request\", \"local\"],
+    \"request\": {
+      \"metadata_url\": \"$deployed_server_metadata_url\"
+    }
+  }
+}"
 
         echo "$config"
         echo "======================"
@@ -108,12 +108,11 @@ metadata_url=$deployed_server_metadata_url"
         host=
         eval host=\${${role}_hosts_a[i]}
         if [ -n "$host" ]; then
-            # Delete the os-collect-config.conf template so our file won't get
-            # overwritten
-            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo /bin/rm -f /usr/libexec/os-apply-config/templates/etc/os-collect-config.conf
-            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host "echo \"$config\" > os-collect-config.conf"
-            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo cp os-collect-config.conf /etc/os-collect-config.conf
-            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo systemctl restart os-collect-config
+            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host "echo '$config' > deployed-server.json"
+            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo mkdir -p -m 0700 /var/lib/os-collect-config/local-data/ || true
+            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo cp deployed-server.json /var/lib/os-collect-config/local-data/deployed-server.json
+            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo systemctl start os-collect-config
+            ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo systemctl enable os-collect-config
         fi
 
         let i+=1

diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 5756c32..7d2d1a1 100644 (file)
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -62,18 +62,13 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/mongodb.json:
           command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
+          permissions:
+            - path: /var/lib/mongodb
+              owner: mongodb:mongodb
+              recurse: true
       docker_config:
         step_2:
-          mongodb_data_ownership:
-            start_order: 0
-            image: *mongodb_image
-            net: host
-            user: root
-            command: ['chown', '-R', 'mongodb:', '/var/lib/mongodb']
-            volumes:
-              - /var/lib/mongodb:/var/lib/mongodb
           mongodb:
-            start_order: 1
             image: *mongodb_image
             net: host
             privileged: false

diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 372f059..cba2070 100644 (file)
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -71,20 +71,14 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/bin/mysqld_safe
+          permissions:
+            - path: /var/lib/mysql
+              owner: mysql:mysql
+              recurse: true
       docker_config:
         step_2:
-          mysql_data_ownership:
-            start_order: 0
-            detach: false
-            image: *mysql_image
-            net: host
-            user: root
-            # Kolla does only non-recursive chown
-            command: ['chown', '-R', 'mysql:', '/var/lib/mysql']
-            volumes:
-              - /var/lib/mysql:/var/lib/mysql
           mysql_bootstrap:
-            start_order: 1
+            start_order: 0
             detach: false
             image: *mysql_image
             net: host
@@ -113,7 +107,7 @@ outputs:
                             - {get_param: MysqlRootPassword}
                             - {get_param: [DefaultPasswords, mysql_root_password]}
           mysql:
-            start_order: 2
+            start_order: 1
             image: *mysql_image
             restart: always
             net: host

diff --git a/environments/services/ceilometer-api.yaml b/environments/services/ceilometer-api.yaml
new file mode 100644 (file)
index 0000000..1e37e73
--- /dev/null
+++ b/environments/services/ceilometer-api.yaml
@@ -0,0 +1,6 @@
+resource_registry:
+  OS::TripleO::Services::CeilometerApi: ../../puppet/services/ceilometer-api.yaml
+
+parameter_defaults:
+  CeilometerApiEndpoint: true
+

diff --git a/environments/services/disable-ceilometer-api.yaml b/environments/services/disable-ceilometer-api.yaml
deleted file mode 100644 (file)
index fb1ea6a..0000000
--- a/environments/services/disable-ceilometer-api.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resource_registry:
-  OS::TripleO::Services::CeilometerApi: OS::Heat::None
-
-parameter_defaults:
-  CeilometerApiEndpoint: false

diff --git a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
index 0d0fa3f..d14ed73 100644 (file)
--- a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
+++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
@@ -240,7 +240,6 @@ case "${REG_METHOD:-}" in
             retry subscription-manager $repos
             retry yum install -y katello-agent || true # needed for errata reporting to satellite6
             katello-package-upload
-            retry subscription-manager repos --disable ${satellite_repo}
         else
             pushd /usr/share/rhn/
             curl --retry ${retry_max_count} --retry-delay 10 --max-time 30 -k -O $REG_SAT_URL/pub/RHN-ORG-TRUSTED-SSL-CERT

diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 185ffdc..e161372 100644 (file)
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -77,7 +77,7 @@ parameters:
     description: Set rabbit subscriber port, change this if using SSL
     type: number
   CeilometerApiEndpoint:
-    default: true
+    default: false
     description: Whether to create or skip API endpoint. Set this to
         false, if you choose to disable Ceilometer API service.
     type: boolean

diff --git a/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml b/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml
new file mode 100644 (file)
index 0000000..2661f7c
--- /dev/null
+++ b/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - Deprecate and disable ceilometer Api by default. This can be enabled
+    by passing in an env file to deploy command.

diff --git a/releasenotes/notes/get-occ-config-local-connector-5bbec3f591a9f311.yaml b/releasenotes/notes/get-occ-config-local-connector-5bbec3f591a9f311.yaml
new file mode 100644 (file)
index 0000000..ef8877a
--- /dev/null
+++ b/releasenotes/notes/get-occ-config-local-connector-5bbec3f591a9f311.yaml
@@ -0,0 +1,10 @@
+---
+fixes:
+  - The deployed-server Heat agent configuration script,
+    get-occ-config.sh, is now updated to configure the
+    local data source for os-collect-config instead of
+    configuring /etc/os-collect-config.conf directly. Doing
+    so means that the configuration template for os-apply-config
+    no longer has to be deleted as the file will be rendered
+    correctly with the right data. See
+    https://bugs.launchpad.net/tripleo/+bug/1679705

diff --git a/releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml b/releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml
new file mode 100644 (file)
index 0000000..c327265
--- /dev/null
+++ b/releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Previously the RHEL registration script disabled the satellite repo after
+    installing the necessary packages from it.  This makes it awkward to
+    update those packages later, so the repo will no longer be disabled.

diff --git a/roles_data.yaml b/roles_data.yaml
index f0ba5f8..7ddb2ee 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -84,7 +84,6 @@
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Securetty
     - OS::TripleO::Services::Timezone
-    - OS::TripleO::Services::CeilometerApi
     - OS::TripleO::Services::CeilometerCollector
     - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CeilometerAgentCentral